diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/master/config.ru | 30 | ||||
| -rw-r--r-- | files/master/puppet.conf | 9 |
2 files changed, 20 insertions, 19 deletions
diff --git a/files/master/config.ru b/files/master/config.ru index cec2a34..b0fd250 100644 --- a/files/master/config.ru +++ b/files/master/config.ru @@ -4,26 +4,28 @@ # 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") +$0 = "master" # if you want debugging: -#ARGV << "--debug" +# 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" +# NOTE: it's unfortunate that we have to use the "CommandLine" class +# here to launch the app, but it contains some initialization logic +# (such as triggering the parsing of the config file) that is very +# important. We should do something less nasty here when we've +# gotten our API and settings initialization logic cleaned up. +# +# Also note that the "$0 = master" line up near the top here is +# the magic that allows the CommandLine class to know that it's +# supposed to be running master. +# +# --cprice 2012-05-22 -require 'puppet/application/puppetmasterd' +require 'puppet/util/command_line' # we're usually running inside a Rack::Builder.new {} block, # therefore we need to call run *here*. -run Puppet::Application[:puppetmasterd].run +run Puppet::Util::CommandLine.new.execute + diff --git a/files/master/puppet.conf b/files/master/puppet.conf index 6b4b0e9..f6471d7 100644 --- a/files/master/puppet.conf +++ b/files/master/puppet.conf @@ -20,7 +20,7 @@ factpath = $vardir/lib/facter plugindest = $vardir/lib/puppet -[puppetd] +[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`` @@ -35,14 +35,13 @@ report=true pluginsync = true - factsync=true logdest=/var/log/puppet/puppet.log -[puppetmasterd] +[master] reportdir = $logdir/reports autoflush = true - storeconfigs=true + #storeconfigs=true dbadapter=mysql dbserver=localhost dbuser=puppet @@ -63,7 +62,7 @@ # configure environments [development] manifest=$vardir/development/etc/manifests/site.pp - modulepath=$vardir/development/manifests + modulepath=$vardir/development/modules/ templatepath=$vardir/development/templates/ [production] |