diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
| commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
| tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/puppet.conf | |
| parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
| parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
| download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 | |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/puppet.conf')
| -rw-r--r-- | puppet/puppet.conf | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/puppet/puppet.conf b/puppet/puppet.conf index 81c47ed..ea5ed0e 100644 --- a/puppet/puppet.conf +++ b/puppet/puppet.conf @@ -1,30 +1,4 @@ [main] -logdir = /var/log/puppet -vardir = /var/lib/puppetmaster -ssldir = $vardir/ssl -rundir = /var/run/puppet -factpath = $vardir/lib/facter -pluginsync = true - -[master] -templatedir = $vardir/templates -masterport = 8140 -autosign = false -storeconfigs = true -dbadapter = sqlite3 -#dbadapter = mysql -#dbserver = localhost -#dbuser = puppet -#dbpassword = hackme -dbconnections = 15 -certname = puppet.vagrantup.com -ssl_client_header = SSL_CLIENT_S_DN -ssl_client_verify_header = SSL_CLIENT_VERIFY - -[agent] -server = puppet.vagrantup.com -vardir = /var/lib/puppet -ssldir = $vardir/ssl -runinterval = 7200 -puppetport = 8139 -configtimeout = 300 + thin_storeconfigs = true + storeconfigs = true + dbadapter = sqlite3 |