devsnack/control-repo
1
0
Fork 0
Code Releases Activity

enable ssl on the webhook

Browse Source
This commit is contained in:
Nick Walker 2015-10-28 10:37:59 -07:00
parent 8fe670beb0
commit d6cb170a78
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
site/profile/manifests/puppetmaster.pp
View File

@ -27,22 +27,24 @@ class profile::puppetmaster {
if $git_management_system in ['gitlab', 'github'] { if $git_management_system in ['gitlab', 'github'] {
git_deploy_key { "add_deploy_key_to_puppet_control-${fqdn}": git_deploy_key { "add_deploy_key_to_puppet_control-${fqdn}":
ensure => present, ensure => present,
name => $::fqdn, name => $::fqdn,
path => "${r10k_ssh_key_file}.pub", path => "${r10k_ssh_key_file}.pub",
token => hiera('gms_api_token'), token => hiera('gms_api_token'),
project_name => 'puppet/control-repo', project_name => 'puppet/control-repo',
server_url => hiera('gms_server_url'), server_url => hiera('gms_server_url'),
provider => $git_management_system, provider => $git_management_system,
disable_ssl_verify => true,
} }
git_webhook { 'web_post_receive_webhook' : git_webhook { 'web_post_receive_webhook' :
ensure => present, ensure => present,
webhook_url => "http://${fqdn}:8088/payload", webhook_url => "http://${fqdn}:8088/payload",
token => hiera('gms_api_token'), token => hiera('gms_api_token'),
project_name => 'puppet/control-repo', project_name => 'puppet/control-repo',
server_url => hiera('gms_server_url'), server_url => hiera('gms_server_url'),
provider => $git_management_system, provider => $git_management_system,
disable_ssl_verify => true,
} }
} }
@ -63,7 +65,7 @@ class profile::puppetmaster {
section => 'main', section => 'main',
setting => 'environment_timeout', setting => 'environment_timeout',
value => 'unlimited', value => 'unlimited',
notify => Service['pe-puppetserver'], notify => Service['pe-puppetserver'],
} }
} }

2
site/profile/manifests/webhook_no_mcollective.pp
View File

@ -1,7 +1,7 @@
class profile::webhook_no_mcollective { class profile::webhook_no_mcollective {
class {'r10k::webhook::config': class {'r10k::webhook::config':
enable_ssl => false, enable_ssl => true,
protected => false, protected => false,
use_mcollective => false, use_mcollective => false,
} }