diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-10-23 19:43:47 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-10-23 19:43:47 -0200 |
| commit | b45c60df8af294fe97b8912a0b9703c76e5de8d6 (patch) | |
| tree | 2a3442f2e0b3c7494cc591ac8c8053d84c3c9d84 /puppet/templates/puppet/puppet.conf.erb | |
| parent | c880b15f013c6d761e4632570112f796ffc1dcda (diff) | |
| parent | 1bfffe2e0adff6e44ec33726988b64f95ea2f599 (diff) | |
| download | debian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.gz debian-b45c60df8af294fe97b8912a0b9703c76e5de8d6.tar.bz2 | |
Merge commit '1bfffe2e0adff6e44ec33726988b64f95ea2f599' into develop
Diffstat (limited to 'puppet/templates/puppet/puppet.conf.erb')
| -rw-r--r-- | puppet/templates/puppet/puppet.conf.erb | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/puppet/templates/puppet/puppet.conf.erb b/puppet/templates/puppet/puppet.conf.erb deleted file mode 100644 index e2751ca..0000000 --- a/puppet/templates/puppet/puppet.conf.erb +++ /dev/null @@ -1,30 +0,0 @@ -[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 = <%= db_password %> -dbconnections = 15 -certname = puppet.<%= base_domain %> -ssl_client_header = SSL_CLIENT_S_DN -ssl_client_verify_header = SSL_CLIENT_VERIFY - -[agent] -server = puppet.<%= base_domain %> -vardir = /var/lib/puppet -ssldir = $vardir/ssl -runinterval = 7200 -puppetport = 8139 -configtimeout = 300 |