Skip to content

Commit d6cb170

Browse files
committed
enable ssl on the webhook
1 parent 8fe670b commit d6cb170

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

site/profile/manifests/puppetmaster.pp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,24 @@
2727
if $git_management_system in ['gitlab', 'github'] {
2828

2929
git_deploy_key { "add_deploy_key_to_puppet_control-${fqdn}":
30-
ensure => present,
31-
name => $::fqdn,
32-
path => "${r10k_ssh_key_file}.pub",
33-
token => hiera('gms_api_token'),
34-
project_name => 'puppet/control-repo',
35-
server_url => hiera('gms_server_url'),
36-
provider => $git_management_system,
30+
ensure => present,
31+
name => $::fqdn,
32+
path => "${r10k_ssh_key_file}.pub",
33+
token => hiera('gms_api_token'),
34+
project_name => 'puppet/control-repo',
35+
server_url => hiera('gms_server_url'),
36+
provider => $git_management_system,
37+
disable_ssl_verify => true,
3738
}
3839

3940
git_webhook { 'web_post_receive_webhook' :
40-
ensure => present,
41-
webhook_url => "http://${fqdn}:8088/payload",
42-
token => hiera('gms_api_token'),
43-
project_name => 'puppet/control-repo',
44-
server_url => hiera('gms_server_url'),
45-
provider => $git_management_system,
41+
ensure => present,
42+
webhook_url => "http://${fqdn}:8088/payload",
43+
token => hiera('gms_api_token'),
44+
project_name => 'puppet/control-repo',
45+
server_url => hiera('gms_server_url'),
46+
provider => $git_management_system,
47+
disable_ssl_verify => true,
4648
}
4749

4850
}
@@ -63,7 +65,7 @@
6365
section => 'main',
6466
setting => 'environment_timeout',
6567
value => 'unlimited',
66-
notify => Service['pe-puppetserver'],
68+
notify => Service['pe-puppetserver'],
6769
}
6870

6971
}

site/profile/manifests/webhook_no_mcollective.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class profile::webhook_no_mcollective {
22

33
class {'r10k::webhook::config':
4-
enable_ssl => false,
4+
enable_ssl => true,
55
protected => false,
66
use_mcollective => false,
77
}

0 commit comments

Comments
 (0)