git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
path: root/site
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-10-29 09:44:01 -0700
committermail_redacted_for_web 2015-10-29 09:53:53 -0700
commite045f172bd5d1b14873bf323fe83230f7cc1aa2c (patch)
tree0087af1aa30c02de079dba7dd5f71086192d4a91 /site
parentb6351f9e5d80bbf93374575591e8a95ad07c255d (diff)
downloadcontrol-repo-template-e045f172bd5d1b14873bf323fe83230f7cc1aa2c.tar.bz2
enable SSL on the zack/r10k webhook
Diffstat (limited to 'site')
-rw-r--r--site/profile/manifests/puppetmaster.pp2
-rw-r--r--site/profile/manifests/webhook_no_mcollective.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index 5c9b59a..d306ad5 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -38,7 +38,7 @@ class profile::puppetmaster {
git_webhook { "web_post_receive_webhook-${::fqdn}" :
ensure => present,
- webhook_url => "http://${::fqdn}:8088/payload",
+ webhook_url => "https://${::fqdn}:8088/payload",
token => hiera('gms_api_token'),
project_name => 'puppet/control-repo',
server_url => hiera('gms_server_url'),
diff --git a/site/profile/manifests/webhook_no_mcollective.pp b/site/profile/manifests/webhook_no_mcollective.pp
index 9f4b7fa..f4f50d7 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 => false,
+ enable_ssl => true,
protected => false,
use_mcollective => false,
}