From 7f9b77c7f6dbc110f20d7c191c27ceba7bdb49a9 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 19 Jan 2010 23:04:10 +0100
Subject: took out "server=puppet.glei.ch"

---
 files/client/puppet.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files')

diff --git a/files/client/puppet.conf b/files/client/puppet.conf
index ee14a20..4a1da55 100644
--- a/files/client/puppet.conf
+++ b/files/client/puppet.conf
@@ -18,7 +18,7 @@
 
 [puppetd]
     report=true
-    server=puppet.glei.ch
+    #server=[fqdn here please]
 
     # different run-interval, default= 30min
     # e.g. run puppetd every 4 hours = 14400
-- 
cgit v1.2.3


From 373617edd3b17ac5605d525e5e96ec5494e573c7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 24 Jan 2010 12:14:50 +0100
Subject: added apache/passenger config variables

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

(limited to 'files')

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


From 8f8a6d24375057029d8fefb2a2a78a22e07e964d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 24 Jan 2010 12:18:12 +0100
Subject: Added puppet::puppetmaster::passenger class to enable
 apache/passenger support

---
 files/master/config.ru | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 files/master/config.ru

(limited to 'files')

diff --git a/files/master/config.ru b/files/master/config.ru
new file mode 100644
index 0000000..b9d8fbc
--- /dev/null
+++ b/files/master/config.ru
@@ -0,0 +1,27 @@
+# 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"
+
+
+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
-- 
cgit v1.2.3


From 1234c4df2d8d02d12ae0f1fc0f6e04e149affce7 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 3 Feb 2010 11:00:11 +0100
Subject: added vardir + ssldir because passenger driven puppetmasterd
 sometimes doesn't read the config at the very startup

---
 files/master/config.ru | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'files')

diff --git a/files/master/config.ru b/files/master/config.ru
index b9d8fbc..cec2a34 100644
--- a/files/master/config.ru
+++ b/files/master/config.ru
@@ -20,6 +20,8 @@ ARGV << "--rack"
 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,
-- 
cgit v1.2.3


From e389655f467038461b42d6ba8d71e87be8622c5f Mon Sep 17 00:00:00 2001
From: nadir <nadir-technik@nadir.org>
Date: Mon, 15 Feb 2010 17:05:36 +0100
Subject: cleaned puppet.conf for the clients

---
 files/client/puppet.conf | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'files')

diff --git a/files/client/puppet.conf b/files/client/puppet.conf
index 4a1da55..e165f73 100644
--- a/files/client/puppet.conf
+++ b/files/client/puppet.conf
@@ -3,18 +3,14 @@
     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
-- 
cgit v1.2.3