summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-08-19 11:51:42 +0200
committermh <mh@immerda.ch>2010-08-19 11:51:42 +0200
commitd8f838c194b151d0d3e7d0d4a0e84ae5eca80be7 (patch)
tree8ab311d5d12bf675d7b6a3b2eaf53d0d738f775f /files
parent8eb08344b6e9f0029deaaabcd18a61009feef9c3 (diff)
turn plugin and fact sync on
As we use custom facts and plugins in our modules I think it's safe to turn them on by default.
Diffstat (limited to 'files')
-rw-r--r--files/client/2.6/puppet.conf2
-rw-r--r--files/client/2.6/puppet.conf.OpenBSD5
-rw-r--r--files/client/puppet.conf2
-rw-r--r--files/client/puppet.conf.OpenBSD5
-rw-r--r--files/master/puppet.conf6
5 files changed, 10 insertions, 10 deletions
diff --git a/files/client/2.6/puppet.conf b/files/client/2.6/puppet.conf
index f3d2e59..6669191 100644
--- a/files/client/2.6/puppet.conf
+++ b/files/client/2.6/puppet.conf
@@ -14,6 +14,8 @@
[agent]
report=true
+ factsync = true
+ pluginsync = true
# different run-interval, default= 30min
# e.g. run puppetd every 4 hours = 14400
diff --git a/files/client/2.6/puppet.conf.OpenBSD b/files/client/2.6/puppet.conf.OpenBSD
index f501f04..013038d 100644
--- a/files/client/2.6/puppet.conf.OpenBSD
+++ b/files/client/2.6/puppet.conf.OpenBSD
@@ -11,9 +11,6 @@
templatedir=$vardir/templates
- # Turn plug-in synchronization on.
- pluginsync = true
- pluginsource = puppet://$server/plugins
factpath = $vardir/lib/facter
[agent]
@@ -32,5 +29,7 @@
user=_puppet
report=true
+ pluginsync=true
+ factsync=true
logdest=/var/log/puppet/puppet.log
diff --git a/files/client/puppet.conf b/files/client/puppet.conf
index d36e202..cad653f 100644
--- a/files/client/puppet.conf
+++ b/files/client/puppet.conf
@@ -14,6 +14,8 @@
[puppetd]
report=true
+ factsync=true
+ pluginsync=true
# different run-interval, default= 30min
# e.g. run puppetd every 4 hours = 14400
diff --git a/files/client/puppet.conf.OpenBSD b/files/client/puppet.conf.OpenBSD
index f501f04..b63bf44 100644
--- a/files/client/puppet.conf.OpenBSD
+++ b/files/client/puppet.conf.OpenBSD
@@ -11,9 +11,6 @@
templatedir=$vardir/templates
- # Turn plug-in synchronization on.
- pluginsync = true
- pluginsource = puppet://$server/plugins
factpath = $vardir/lib/facter
[agent]
@@ -32,5 +29,7 @@
user=_puppet
report=true
+ factsync=true
+ pluginsync=true
logdest=/var/log/puppet/puppet.log
diff --git a/files/master/puppet.conf b/files/master/puppet.conf
index 0027e57..6b4b0e9 100644
--- a/files/master/puppet.conf
+++ b/files/master/puppet.conf
@@ -17,9 +17,6 @@
# The default value is '$confdir/ssl'.
ssldir = $vardir/ssl
- # Turn plug-in synchronization on.
- pluginsync = true
- pluginsource = puppet://$server/plugins
factpath = $vardir/lib/facter
plugindest = $vardir/lib/puppet
@@ -37,7 +34,8 @@
localconfig = $vardir/localconfig
report=true
- server=puppet.glei.ch
+ pluginsync = true
+ factsync=true
logdest=/var/log/puppet/puppet.log