confdroid/puppet_cd
3
0
Fork 0
Code Wiki Activity

update erb

Browse Source
This commit is contained in:
Arne Teuke
2025-02-26 21:59:41 +01:00
parent 7271afe02d
commit a75ddf964c
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/main/config.pp
View File

@@ -6,7 +6,5 @@
class puppet_cd::main::config ( class puppet_cd::main::config (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
if $fqdn == $pt_pm_fqdn { include puppet_cd::server::service
include puppet_cd::server::service
}
} }

3
manifests/main/files.pp
View File

@@ -15,7 +15,7 @@ class puppet_cd::main::files (
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => template($pt_agent_conf_erb), content => template($pt_puppet_conf_erb),
notify => Service[$pt_agent_service], notify => Service[$pt_agent_service],
} }
} }
@@ -33,6 +33,7 @@ class puppet_cd::main::files (
} }
if $pt_use_puppetdb == true { if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file: file { $pt_puppetdb_conf_file:
ensure => filet, ensure => filet,
path => $pt_puppetdb_conf_file, path => $pt_puppetdb_conf_file,

17
templates/puppet.conf.erb
View File

@@ -52,4 +52,19 @@
<% if @pt_use_puppetdb == true %> <% if @pt_use_puppetdb == true %>
storeconfigs = true storeconfigs = true
storeconfigs_backend = <%= @pt_storeconfigs_backend %> storeconfigs_backend = <%= @pt_storeconfigs_backend %>
<% end end -%> <% end end -%>
<% if @fqdn != @pt_pm_fqdn -%>
[agent]
server = <%= @pt_pm_fqdn %>
classfile = $statedir/classes.txt
default_schedules = <%= @pt_default_schedules %>
environment = <%= @pt_environment %>
masterport = <%= @pt_masterport %>
noop = <%= @pt_noop %>
pluginsync = <%= @pt_pluginsync %>
report = <%= @pt_report %>
runinterval = <%= @pt_runinterval %>
splay = <%= @pt_splay %>
splaylimit = <%= @pt_splaylimit %>
usecacheonfailure = <%= @pt_usecacheonfailure %>
<% end %>