From 9c6b9e1a6842547dc43f6d4255844dc93540ffd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 19 Apr 2011 15:43:33 +0300
Subject: [PATCH] Fixed puppetmaster bootstrap script for 2.6 series puppet.

---
 puppet/bootstrap-server.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/puppet/bootstrap-server.sh b/puppet/bootstrap-server.sh
index 1dd9736..457877f 100755
--- a/puppet/bootstrap-server.sh
+++ b/puppet/bootstrap-server.sh
@@ -19,8 +19,16 @@ fi
 
 ssldir=`echo "require 'puppet'; Puppet.parse_config; print Puppet.settings.value('ssldir')" | ruby`
 
-(
-    echo "\$homename = '`hostname -f`'"
-    echo "\$puppet_ssldir = '${ssldir}'"
-    echo "include puppet::server::apache"
-) | puppet --no-report
+cat /dev/null > /etc/puppet/puppet.conf
+
+puppet --version | egrep "^0\." > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+    (
+        echo "\$homename = '`hostname -f`'"
+        echo "\$puppet_ssldir = '${ssldir}'"
+        echo "include puppet::server::apache"
+    ) | puppet --no-report
+else
+    echo "include puppet::server::apache" | \
+        puppet apply --no-report --manifest /dev/stdin /dev/null
+fi