summaryrefslogtreecommitdiff
path: root/puppet/puppet.conf
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/puppet.conf')
-rw-r--r--puppet/puppet.conf32
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