diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:00:46 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 17:00:46 -0200 |
| commit | 7113c1868df70181bc8315c3f6ec9a7d1e3fe650 (patch) | |
| tree | b916bbe6540d53d3dba054db116210b72e616e16 /templates | |
| parent | 7c570f42da2605ba53fcc54741cee7d68f028ab6 (diff) | |
| download | puppet-puppet-7113c1868df70181bc8315c3f6ec9a7d1e3fe650.tar.gz puppet-puppet-7113c1868df70181bc8315c3f6ec9a7d1e3fe650.tar.bz2 | |
Parametrizing more variables
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/check-puppetd.sh.erb | 2 | ||||
| -rw-r--r-- | templates/puppet-node.conf.erb | 10 | ||||
| -rw-r--r-- | templates/puppetmaster.erb | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/templates/check-puppetd.sh.erb b/templates/check-puppetd.sh.erb index d467ad6..ee2fc7a 100644 --- a/templates/check-puppetd.sh.erb +++ b/templates/check-puppetd.sh.erb @@ -4,7 +4,7 @@ # PATH="$PATH:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" -PID="/var/run/puppet/<%= puppet_agent_name %>.pid" +PID="/var/run/puppet/<%= agent_name %>.pid" INIT="/etc/init.d/puppet" LOCKFILE="/var/run/puppet/check-puppetd.pid" diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb index ac113bc..7df045c 100644 --- a/templates/puppet-node.conf.erb +++ b/templates/puppet-node.conf.erb @@ -6,11 +6,11 @@ rundir = /var/run/puppet factpath = $vardir/lib/facter pluginsync = true -[<%= puppet_agent_name %>] +[<%= agent_name %>] vardir = /var/lib/puppet ssldir = $vardir/ssl -server = <%= puppetd_server %> -runinterval = <%= puppetd_runinterval %> +server = <%= server %> +runinterval = <%= runinterval %> puppetport = 8139 -masterport = <%= puppetmaster_port %> -configtimeout = <%= puppetd_configtimeout %> +masterport = <%= port %> +configtimeout = <%= configtimeout %> diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb index b3ce647..750e080 100644 --- a/templates/puppetmaster.erb +++ b/templates/puppetmaster.erb @@ -4,8 +4,8 @@ START=yes # Startup options -DAEMON_OPTS="<%= puppetmaster_daemon_opts %>" -<% if puppetmaster_servertype == 'mongrel' %> +DAEMON_OPTS="<%= daemon_opts %>" +<% if servertype == 'mongrel' %> # What server type to run # Options: # webrick (default, cannot handle more than ~30 nodes) @@ -15,11 +15,11 @@ DAEMON_OPTS="<%= puppetmaster_daemon_opts %>" # mongrel. Requires front-end web-proxy such as # apache, nginx, or pound) # See: http://reductivelabs.com/trac/puppet/wiki/UsingMongrel -SERVERTYPE=<%= puppetmaster_servertype %> +SERVERTYPE=<%= servertype %> # How many puppetmaster instances to start? Its pointless to set this # higher than 1 if you are not using mongrel. -PUPPETMASTERS=<%= puppetmaster_puppetmasters %> +PUPPETMASTERS=<%= worker_processes %> # What port should the puppetmaster listen on (default: 8140). If # PUPPETMASTERS is set to a number greater than 1, then the port for |