git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
path: root/site/profile/manifests/puppetmaster.pp
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-10-28 10:37:59 -0700
committermail_redacted_for_web 2015-10-28 10:37:59 -0700
commitd6cb170a787da4ca4c0d830c5002893f7ae72bb3 (patch)
tree1cf61581fa78e5b5d78d731ac4d57092d27d4f4e /site/profile/manifests/puppetmaster.pp
parent8fe670beb09ffa086c5c8937bfc12d64d3296578 (diff)
downloadcontrol-repo-template-d6cb170a787da4ca4c0d830c5002893f7ae72bb3.tar.bz2
enable ssl on the webhook
Diffstat (limited to 'site/profile/manifests/puppetmaster.pp')
-rw-r--r--site/profile/manifests/puppetmaster.pp30
1 files changed, 16 insertions, 14 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'],
}
}