confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

Merge branch 'jenkins-build-83' into 'master'

Browse Source 
Auto-merge for build 83

See merge request puppet/puppet_cd!79
This commit is contained in:
Jenkins
2025-10-27 23:05:19 +00:00
parent 45443a92a1 eef61e60eb
commit c7a112d93b
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
View File

@@ -174,17 +174,17 @@ class puppet_cd::main::files (
notify => Service[$pt_agent_service,$pt_server_service],
}
if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file:
ensure => file,
path => $pt_puppetdb_conf_file,
owner => 'root',
group => 'root',
mode => '0644',
content => template($pt_puppetdb_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service],
}
}
# if $pt_use_puppetdb == true {
# file { $pt_puppetdb_conf_file:
# ensure => file,
# path => $pt_puppetdb_conf_file,
# owner => 'root',
# group => 'root',
# mode => '0644',
# content => template($pt_puppetdb_conf_erb),
# notify => Service[$pt_agent_service,$pt_server_service],
# }
# }
}
}</pre>
</td>

22
manifests/main/files.pp
View File

@@ -31,16 +31,16 @@ class puppet_cd::main::files (
notify => Service[$pt_agent_service,$pt_server_service],
}
if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file:
ensure => file,
path => $pt_puppetdb_conf_file,
owner => 'root',
group => 'root',
mode => '0644',
content => template($pt_puppetdb_conf_erb),
notify => Service[$pt_agent_service,$pt_server_service],
}
}
# if $pt_use_puppetdb == true {
# file { $pt_puppetdb_conf_file:
# ensure => file,
# path => $pt_puppetdb_conf_file,
# owner => 'root',
# group => 'root',
# mode => '0644',
# content => template($pt_puppetdb_conf_erb),
# notify => Service[$pt_agent_service,$pt_server_service],
# }
# }
}
}