diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 11:38:24 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-04 11:38:24 -0300 |
| commit | 71e2d679d6757b9f7b6680468c4c6d6e3c42dcc6 (patch) | |
| tree | ba38cef2d9f7aac04f5e333f65e6ba29eedd655b /templates/puppet/puppet.conf.erb | |
| parent | e1db7cfa877187a2e711e1f6500e452cf24fa006 (diff) | |
| download | puppet-bootstrap-71e2d679d6757b9f7b6680468c4c6d6e3c42dcc6.tar.gz puppet-bootstrap-71e2d679d6757b9f7b6680468c4c6d6e3c42dcc6.tar.bz2 | |
Initial config target
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 |