diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/client/puppet.conf | 12 | ||||
| -rw-r--r-- | files/master/config.ru | 29 | ||||
| -rw-r--r-- | files/master/puppet.conf | 5 |
3 files changed, 38 insertions, 8 deletions
diff --git a/files/client/puppet.conf b/files/client/puppet.conf index ee14a20..e165f73 100644 --- a/files/client/puppet.conf +++ b/files/client/puppet.conf @@ -3,22 +3,18 @@ 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 = /var/lib/puppet/lib + libdir = $vardir/lib - templatedir=/var/lib/puppet/templates + templatedir=$vardir/templates - # Turn plug-in synchronization on. - pluginsync = true - pluginsource = puppet://$server/plugins - factpath = $vardir/lib/facter + factpath = $libdir/facter [puppetd] report=true - server=puppet.glei.ch + #server=[fqdn here please] # different run-interval, default= 30min # e.g. run puppetd every 4 hours = 14400 diff --git a/files/master/config.ru b/files/master/config.ru new file mode 100644 index 0000000..cec2a34 --- /dev/null +++ b/files/master/config.ru @@ -0,0 +1,29 @@ +# a config.ru, for use with every rack-compatible webserver. +# SSL needs to be handled outside this, though. + +# if puppet is not in your RUBYLIB: +# $:.unshift('/opt/puppet/lib') + +$0 = "puppetmasterd" +require 'puppet' + +# logs to file instead of syslog +#Puppet::Util::Log.newdestination("/var/log/puppet/puppetmasterd.log") + +# if you want debugging: +#ARGV << "--debug" + +ARGV << "--rack" + +# in some setups puppetmasterd doesn't seem to read the puppet.conf +# config at startup, then you need to pass these options: +ARGV << "--vardir" << "/var/lib/puppet" +ARGV << "--ssldir" << "/var/lib/puppet/ssl" + +# if you use puppet-dashboard: +#ARGV << "--reports" << "puppet_dashboard" + +require 'puppet/application/puppetmasterd' +# we're usually running inside a Rack::Builder.new {} block, +# therefore we need to call run *here*. +run Puppet::Application[:puppetmasterd].run diff --git a/files/master/puppet.conf b/files/master/puppet.conf index bcf2a23..0027e57 100644 --- a/files/master/puppet.conf +++ b/files/master/puppet.conf @@ -54,6 +54,11 @@ #usage for clusters #ssl_client_header=HTTP_X_SSL_SUBJECT + # apache2/passenger usage: http://github.com/reductivelabs/puppet/tree/master/ext/rack + ssl_client_header = SSL_CLIENT_S_DN + ssl_client_verify_header = SSL_CLIENT_VERIFY + + # specify allowed environments environments=production,development |