From fa22657268eca9fa369e8c9ca31032c38e948e4b Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 8 Aug 2010 22:17:23 +0200 Subject: add 2.6 configuration for client --- files/client/2.6/puppet.conf | 22 ++++++++++++++++++++++ files/client/2.6/puppet.conf.OpenBSD | 36 ++++++++++++++++++++++++++++++++++++ files/client/puppet.conf | 1 - files/client/puppet.conf.OpenBSD | 25 ++++++++++++------------- 4 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 files/client/2.6/puppet.conf create mode 100644 files/client/2.6/puppet.conf.OpenBSD (limited to 'files') diff --git a/files/client/2.6/puppet.conf b/files/client/2.6/puppet.conf new file mode 100644 index 0000000..f3d2e59 --- /dev/null +++ b/files/client/2.6/puppet.conf @@ -0,0 +1,22 @@ +[main] + logdir=/var/log/puppet + vardir=/var/lib/puppet + rundir=/var/run/puppet + + ssldir=$vardir/ssl + + # Where 3rd party plugins and modules are installed + libdir = $vardir/lib + + templatedir=$vardir/templates + + factpath = $libdir/facter + +[agent] + report=true + + # different run-interval, default= 30min + # e.g. run puppetd every 4 hours = 14400 + # runinterval = 14400 + + logdest=/var/log/puppet/puppet.log diff --git a/files/client/2.6/puppet.conf.OpenBSD b/files/client/2.6/puppet.conf.OpenBSD new file mode 100644 index 0000000..f501f04 --- /dev/null +++ b/files/client/2.6/puppet.conf.OpenBSD @@ -0,0 +1,36 @@ +[main] + logdir=/var/log/puppet + vardir=/var/lib/puppet + rundir=/var/run/puppet + + #ssldir=/var/lib/puppet/ssl + ssldir=$vardir/ssl + + # Where 3rd party plugins and modules are installed + libdir = $vardir/lib + + templatedir=$vardir/templates + + # Turn plug-in synchronization on. + pluginsync = true + pluginsource = puppet://$server/plugins + factpath = $vardir/lib/facter + +[agent] + # The file in which puppetd stores a list of the classes + # associated with the retrieved configuratiion. Can be loaded in + # the separate ``puppet`` executable using the ``--loadclasses`` + # option. + # The default value is '$confdir/classes.txt'. + classfile = $vardir/classes.txt + + # Where puppetd caches the local configuration. An + # extension indicating the cache format is added automatically. + # The default value is '$confdir/localconfig'. + localconfig = $vardir/localconfig + + user=_puppet + + report=true + + logdest=/var/log/puppet/puppet.log diff --git a/files/client/puppet.conf b/files/client/puppet.conf index e165f73..d36e202 100644 --- a/files/client/puppet.conf +++ b/files/client/puppet.conf @@ -14,7 +14,6 @@ [puppetd] report=true - #server=[fqdn here please] # 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 6b4032f..f501f04 100644 --- a/files/client/puppet.conf.OpenBSD +++ b/files/client/puppet.conf.OpenBSD @@ -16,22 +16,21 @@ pluginsource = puppet://$server/plugins factpath = $vardir/lib/facter -[puppetd] - # The file in which puppetd stores a list of the classes - # associated with the retrieved configuratiion. Can be loaded in - # the separate ``puppet`` executable using the ``--loadclasses`` - # option. - # The default value is '$confdir/classes.txt'. - classfile = $vardir/classes.txt +[agent] + # The file in which puppetd stores a list of the classes + # associated with the retrieved configuratiion. Can be loaded in + # the separate ``puppet`` executable using the ``--loadclasses`` + # option. + # The default value is '$confdir/classes.txt'. + classfile = $vardir/classes.txt - # Where puppetd caches the local configuration. An - # extension indicating the cache format is added automatically. - # The default value is '$confdir/localconfig'. - localconfig = $vardir/localconfig + # Where puppetd caches the local configuration. An + # extension indicating the cache format is added automatically. + # The default value is '$confdir/localconfig'. + localconfig = $vardir/localconfig - user=_puppet + user=_puppet report=true - server=puppet.glei.ch logdest=/var/log/puppet/puppet.log -- cgit v1.2.3