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:45:45 +01:00
parent 1add61cf33
commit 7271afe02d
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/main/files.pp
View File

@@ -15,7 +15,7 @@ class puppet_cd::main::files (
owner => 'root',
group => 'root',
mode => '0644',
content => template($pt_puppet_conf_erb),
content => template($pt_agent_conf_erb),
notify => Service[$pt_agent_service],
}
}

1
manifests/params.pp
View File

@@ -138,6 +138,7 @@ class puppet_cd::params (
## puppet
$pt_puppet_conf_file = "${pt_puppetdir}/puppet.conf"
$pt_puppet_conf_erb = 'puppet_cd/puppet.conf.erb'
$pt_agent_conf_erb = 'puppet_cd/agent.conf.erb'
$pt_hiera_config = "${pt_puppetdir}/hiera.yaml"
## puppetdb
$pt_bootstrap_conf = "${pt_puppetdb_main}/bootstrap.cfg"

17
templates/agent.conf.erb Normal file
View File

@@ -0,0 +1,17 @@
###############################################################################
########## puppet.conf generated by puppet ###########
###############################################################################
[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 %>

15
templates/puppet.conf.erb
View File

@@ -53,18 +53,3 @@
storeconfigs = true
storeconfigs_backend = <%= @pt_storeconfigs_backend %>
<% 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 %>