git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-10-28 11:27:57 -0700
committermail_redacted_for_web 2015-10-28 11:27:57 -0700
commitc2aeccd388fb56fdb7b02d4796ab5e140bce00e8 (patch)
tree61c1824b18613f8cfb833188a46ab6ea5c8b1ede
parentd6cb170a787da4ca4c0d830c5002893f7ae72bb3 (diff)
downloadcontrol-repo-template-c2aeccd388fb56fdb7b02d4796ab5e140bce00e8.tar.bz2
disable SSL on the zack/r10k webhook
The abrader/gms provider for gitlab doesn't support disabling ssl verification but will soon.
-rw-r--r--site/profile/manifests/puppetmaster.pp1
-rw-r--r--site/profile/manifests/webhook_no_mcollective.pp2
2 files changed, 1 insertions, 2 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index 3085300..8e0817c 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -34,7 +34,6 @@ class profile::puppetmaster {
project_name => 'puppet/control-repo',
server_url => hiera('gms_server_url'),
provider => $git_management_system,
- disable_ssl_verify => true,
}
git_webhook { 'web_post_receive_webhook' :
diff --git a/site/profile/manifests/webhook_no_mcollective.pp b/site/profile/manifests/webhook_no_mcollective.pp
index f4f50d7..9f4b7fa 100644
--- a/site/profile/manifests/webhook_no_mcollective.pp
+++ b/site/profile/manifests/webhook_no_mcollective.pp
@@ -1,7 +1,7 @@
class profile::webhook_no_mcollective {
class {'r10k::webhook::config':
- enable_ssl => true,
+ enable_ssl => false,
protected => false,
use_mcollective => false,
}