summaryrefslogtreecommitdiff
path: root/puppet.conf
diff options
context:
space:
mode:
Diffstat (limited to 'puppet.conf')
-rw-r--r--puppet.conf15
1 files changed, 4 insertions, 11 deletions
diff --git a/puppet.conf b/puppet.conf
index 266ec51..b50d304 100644
--- a/puppet.conf
+++ b/puppet.conf
@@ -1,14 +1,7 @@
[main]
-logdir=/var/log/puppet
-vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
-rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-prerun_command=/etc/puppet/etckeeper-commit-pre
-postrun_command=/etc/puppet/etckeeper-commit-post
+ssldir = /var/lib/puppet/ssl
[master]
-# These are needed when the puppetmaster is run by passenger
-# and can safely be removed if webrick is used.
-ssl_client_header = SSL_CLIENT_S_DN
-ssl_client_verify_header = SSL_CLIENT_VERIFY
+vardir = /var/lib/puppet
+cadir = /var/lib/puppet/ssl/ca
+dns_alt_names = puppet