confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

fix syntax - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284

Browse Source
This commit is contained in:
Arne Teuke
2025-10-23 21:19:16 +02:00
parent 1ba00dc6c6
commit 1671706f99
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/params.pp
View File

@@ -203,7 +203,7 @@ class puppet_cd::params (
$pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb' $pt_puppetdb_var_dir = '/opt/puppetlabs/server/data/puppetdb'
## r10k ## r10k
$pt_r10k_dir = "${pt_main_dir}/r10k" $pt_r10k_dir = "${pt_main_dir}/r10k"
$pt_r10k_webhook_dir = */etc/r10k-webhook' $pt_r10k_webhook_dir = '/etc/r10k-webhook'
# files # files
## puppet ## puppet
@@ -236,13 +236,12 @@ class puppet_cd::params (
$pt_r10k_hook_config_file = "${pt_r10k_webhook_dir}/hooks.json" $pt_r10k_hook_config_file = "${pt_r10k_webhook_dir}/hooks.json"
$pt_r10k_hook_config_erb = 'puppet_cd/r10k/hook_config.erb' $pt_r10k_hook_config_erb = 'puppet_cd/r10k/hook_config.erb'
$pt_r10k_hook_service_file = '/etc/systemd/system/webhook.service' $pt_r10k_hook_service_file = '/etc/systemd/system/webhook.service'
$pt_r10k_hook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb' $pt_r10k_hook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb'
# service # service
$pt_server_service = 'puppetserver' $pt_server_service = 'puppetserver'
$pt_agent_service = 'puppet' $pt_agent_service = 'puppet'
$pt_db_service = 'puppetdb' $pt_db_service = 'puppetdb'
$pt_r10k_wb_service = 'r10k-webhook'
# #
# includes must be last # includes must be last

2
manifests/r10k/webhook.pp
View File

@@ -60,7 +60,7 @@ class puppet_cd::r10k::webhook (
service { 'r10k-webhook': service { 'r10k-webhook':
ensure => 'running', ensure => 'running',
enable => true, enable => true,
subscribe => File[$pt_r10k_hook_service_erb], subscribe => File[$pt_r10k_hook_config_file],
} }
} }
} }