From 51c7b390694d95e7096e33317de4242d67ca7e38 Mon Sep 17 00:00:00 2001
From: Keith aka fugit <fugit13@gmail.com>
Date: Wed, 13 Apr 2011 10:35:57 -0400
Subject: updated allow insatll of puppetmaster on squeeze. This addresses the
 package diferences.

---
 files/master/puppet.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'files/master')

diff --git a/files/master/puppet.conf b/files/master/puppet.conf
index 6b4b0e9..fcaef0d 100644
--- a/files/master/puppet.conf
+++ b/files/master/puppet.conf
@@ -42,7 +42,7 @@
 [puppetmasterd]
     reportdir = $logdir/reports
     autoflush = true
-    storeconfigs=true
+    #storeconfigs=true
     dbadapter=mysql
     dbserver=localhost
     dbuser=puppet
@@ -63,7 +63,7 @@
     # configure environments
     [development]
     manifest=$vardir/development/etc/manifests/site.pp
-    modulepath=$vardir/development/manifests
+    modulepath=$vardir/development/modules/
     templatepath=$vardir/development/templates/
 
     [production]
-- 
cgit v1.2.3


From 0e6eab4d0c31f358bdca76eed7001846a9afae4c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 16 Jul 2012 14:16:43 -0400
Subject: update puppet.conf default file to have the newer section headings,
 required to eliminate deprecation warnings

---
 files/master/puppet.conf | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'files/master')

diff --git a/files/master/puppet.conf b/files/master/puppet.conf
index fcaef0d..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,11 +35,10 @@
 
     report=true
     pluginsync = true
-    factsync=true
 
     logdest=/var/log/puppet/puppet.log
 
-[puppetmasterd]
+[master]
     reportdir = $logdir/reports
     autoflush = true
     #storeconfigs=true
-- 
cgit v1.2.3


From 47808ed4f4a446ed48b448d72e820ca60e05776c Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 16 Jul 2012 14:22:31 -0400
Subject: update config.ru to newer version as supplied by puppetlabs for
 passenger applications. This is likely not to work with older versions of
 passenger

---
 files/master/config.ru | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'files/master')

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
+
-- 
cgit v1.2.3