diff options
| author | Micah Anderson <micah@riseup.net> | 2010-11-28 13:08:12 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-11-28 13:08:12 -0500 |
| commit | 6b7d4a253cd2901074aa1bbb38f756fe9ac71aff (patch) | |
| tree | e77537841453e0ef4e85856239690b098be4b135 /files | |
| parent | bb8ede5cfa0bdbdcc0244a590e6453f16d815cb6 (diff) | |
default client puppet.conf changes:
. add a default production environment
. add a development environmnet
. due to deprecation notice in 2.6, change the [puppetd] section header to [agent]
. remove the default server puppet.glei.ch, the default server should just be puppet.$fqdn
. remove some option comments that aren't being used
. remove logdest as this isn't a valid option anymore, and was set to the default
. replace the templatedir full path with the $vardir path.
. add the module path
Conflicts:
files/client/puppet.conf
Diffstat (limited to 'files')
| -rw-r--r-- | files/client/2.6/puppet.conf | 16 | ||||
| -rw-r--r-- | files/client/puppet.conf | 12 |
2 files changed, 16 insertions, 12 deletions
diff --git a/files/client/2.6/puppet.conf b/files/client/2.6/puppet.conf index 6c6a6cc..847f23c 100644 --- a/files/client/2.6/puppet.conf +++ b/files/client/2.6/puppet.conf @@ -6,18 +6,20 @@ ssldir=$vardir/ssl # Where 3rd party plugins and modules are installed - libdir = $vardir/lib - - templatedir=$vardir/templates + libdir = $vardir/lib + templatedir=$vardir/templates + modulepath=/etc/puppet/modules factpath = $libdir/facter [agent] report=true pluginsync = true - # different run-interval, default= 30min - # e.g. run puppetd every 4 hours = 14400 - # runinterval = 14400 + # Default environment + environment = production - logdest=/var/log/puppet/puppet.log + # Development environment + [development] + modulepath = /etc/puppet/development/modules + manifest = /etc/puppet/development/manifests/site.pp diff --git a/files/client/puppet.conf b/files/client/puppet.conf index 9ee333c..09b47b1 100644 --- a/files/client/puppet.conf +++ b/files/client/puppet.conf @@ -9,15 +9,17 @@ libdir = $vardir/lib templatedir=$vardir/templates - + modulepath=/etc/puppet/modules factpath = $libdir/facter [puppetd] report=true pluginsync=true - # different run-interval, default= 30min - # e.g. run puppetd every 4 hours = 14400 - # runinterval = 14400 + # Default environment + environment = production - logdest=/var/log/puppet/puppet.log + # Development environment + [development] + modulepath = /etc/puppet/development/modules + manifest = /etc/puppet/development/manifests/site.pp |