diff options
Diffstat (limited to 'templates/puppet/puppet.conf.erb')
| -rw-r--r-- | templates/puppet/puppet.conf.erb | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/templates/puppet/puppet.conf.erb b/templates/puppet/puppet.conf.erb index 72306a2..2ebfc9e 100644 --- a/templates/puppet/puppet.conf.erb +++ b/templates/puppet/puppet.conf.erb @@ -1,29 +1,29 @@ [main] -rundir = /var/run/puppet -logdir = /var/log/puppet -vardir = /var/lib/puppetmaster -ssldir = $vardir/ssl -factpath = $vardir/lib/facter -pluginsync = true +logdir = /var/log/puppet +vardir = /var/lib/puppetmaster +ssldir = $vardir/ssl +rundir = /var/run/puppet +factpath = $vardir/lib/facter +pluginsync = true [master] -vardir = /var/lib/puppet -templatedir = $vardir/templates -autosign = false -certname = puppet.<%= domain%> -#storeconfigs = true -#dbadapter = mysql -#dbserver = localhost -#dbuser = puppet -#dbpassword = -#dbconnections = 15 - -# Needed by mongrel -ssl_client_header = HTTP_X_SSL_SUBJECT +templatedir = $vardir/templates +masterport = 8140 +autosign = false +storeconfigs = true +dbadapter = mysql +dbserver = localhost +dbuser = puppet +dbpassword = <%= storeconfigs_pw %> +dbconnections = 15 +certname = puppet.<%= base_domain %> +ssl_client_header = SSL_CLIENT_S_DN +ssl_client_verify_header = SSL_CLIENT_VERIFY [agent] -server = puppet.<%= domain%> -vardir = /var/lib/puppet -ssldir = $vardir/ssl -runinterval = 1800 -puppetport = 8139 +server = puppet.<%= base_domain %> +vardir = /var/lib/puppet +ssldir = $vardir/ssl +runinterval = 7200 +puppetport = 8139 +configtimeout = 300 |