confdroid/confdroid_puppet
3
0
Fork 0
Code Issues Packages Wiki Activity

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

Browse Source 
Auto-merge for build 85

See merge request puppet/puppet_cd!81
This commit is contained in:
Jenkins
2025-10-27 23:51:53 +00:00
parent fb3c767e25 ceb06ac75d
commit d03e67e966
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], notify => Service[$pt_agent_service,$pt_server_service],
} }
# if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
# ensure => file, ensure => file,
# path => $pt_puppetdb_conf_file, path => $pt_puppetdb_conf_file,
# owner => 'root', owner => 'root',
# group => 'root', group => 'root',
# mode => '0644', mode => '0644',
# content => template($pt_puppetdb_conf_erb), content => template($pt_puppetdb_conf_erb),
# notify => Service[$pt_agent_service,$pt_server_service], notify => Service[$pt_agent_service,$pt_server_service],
# } }
# } }
} }
}</pre> }</pre>
</td> </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], notify => Service[$pt_agent_service,$pt_server_service],
} }
# if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
# file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
# ensure => file, ensure => file,
# path => $pt_puppetdb_conf_file, path => $pt_puppetdb_conf_file,
# owner => 'root', owner => 'root',
# group => 'root', group => 'root',
# mode => '0644', mode => '0644',
# content => template($pt_puppetdb_conf_erb), content => template($pt_puppetdb_conf_erb),
# notify => Service[$pt_agent_service,$pt_server_service], notify => Service[$pt_agent_service,$pt_server_service],
# } }
# } }
} }
} }