From d6cb170a787da4ca4c0d830c5002893f7ae72bb3 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 28 Oct 2015 10:37:59 -0700
Subject: [PATCH] enable ssl on the webhook

---
 site/profile/manifests/puppetmaster.pp        | 30 ++++++++++---------
 .../manifests/webhook_no_mcollective.pp       |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index 1c618a2..3085300 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -27,22 +27,24 @@ class profile::puppetmaster {
   if $git_management_system in ['gitlab', 'github'] {
    
     git_deploy_key { "add_deploy_key_to_puppet_control-${fqdn}":
-      ensure       => present,
-      name         => $::fqdn,
-      path         => "${r10k_ssh_key_file}.pub",
-      token        => hiera('gms_api_token'),
-      project_name => 'puppet/control-repo',
-      server_url   => hiera('gms_server_url'),
-      provider     => $git_management_system,
+      ensure             => present,
+      name               => $::fqdn,
+      path               => "${r10k_ssh_key_file}.pub",
+      token              => hiera('gms_api_token'),
+      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' :
-      ensure       => present,
-      webhook_url  => "http://${fqdn}:8088/payload",
-      token        => hiera('gms_api_token'),
-      project_name => 'puppet/control-repo',
-      server_url   => hiera('gms_server_url'),
-      provider     => $git_management_system,
+      ensure             => present,
+      webhook_url        => "http://${fqdn}:8088/payload",
+      token              => hiera('gms_api_token'),
+      project_name       => 'puppet/control-repo',
+      server_url         => hiera('gms_server_url'),
+      provider           => $git_management_system,
+      disable_ssl_verify => true,
     }
 
   }
@@ -63,7 +65,7 @@ class profile::puppetmaster {
     section => 'main',
     setting => 'environment_timeout',
     value   => 'unlimited',
-    notify     => Service['pe-puppetserver'],
+    notify  => Service['pe-puppetserver'],
   }
 
 }
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,
   }