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