diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-13 13:39:22 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-13 13:46:04 +0100 |
| commit | 861312a7c91faf1dc54e49891396865c3c91eb5d (patch) | |
| tree | d6d2a48d56fdbcaf4e1c8bff3f2e5d46fdd64133 /puppet.conf | |
| parent | 146370fb4938086991d9ec4c6170fa31aebd0f07 (diff) | |
| download | puppet.KATH-861312a7c91faf1dc54e49891396865c3c91eb5d.tar.gz puppet.KATH-861312a7c91faf1dc54e49891396865c3c91eb5d.tar.bz2 puppet.KATH-861312a7c91faf1dc54e49891396865c3c91eb5d.zip | |
port configuration to puppet 4.x
Diffstat (limited to 'puppet.conf')
| -rw-r--r-- | puppet.conf | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/puppet.conf b/puppet.conf index 266ec51..c317c16 100644 --- a/puppet.conf +++ b/puppet.conf @@ -1,14 +1,9 @@ [main] -logdir=/var/log/puppet -vardir=/var/lib/puppet -ssldir=/var/lib/puppet/ssl -rundir=/var/run/puppet -factpath=$vardir/lib/facter +ssldir = /var/lib/puppet/ssl prerun_command=/etc/puppet/etckeeper-commit-pre postrun_command=/etc/puppet/etckeeper-commit-post [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 |