puppet 0.24.5 → 0.24.6

data/conf/osx/PackageInfo.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIdentifier</key>
+	<string>com.reductivelabs.puppet</string>
+	<key>CFBundleShortVersionString</key>
+	<string>{SHORTVERSION}</string>
+	<key>IFMajorVersion</key>
+	<integer>{MAJORVERSION}</integer>
+	<key>IFMinorVersion</key>
+	<integer>{MINORVERSION}</integer>
+	<key>IFPkgFlagAllowBackRev</key>
+	<false/>
+	<key>IFPkgFlagAuthorizationAction</key>
+	<string>RootAuthorization</string>
+	<key>IFPkgFlagDefaultLocation</key>
+	<string>/</string>
+	<key>IFPkgFlagFollowLinks</key>
+	<true/>
+	<key>IFPkgFlagInstallFat</key>
+	<false/>
+	<key>IFPkgFlagIsRequired</key>
+	<false/>
+	<key>IFPkgFlagOverwritePermissions</key>
+	<false/>
+	<key>IFPkgFlagRelocatable</key>
+	<false/>
+	<key>IFPkgFlagRestartAction</key>
+	<string>None</string>
+	<key>IFPkgFlagRootVolumeOnly</key>
+	<true/>
+	<key>IFPkgFlagUpdateInstalledLanguages</key>
+	<false/>
+</dict>
+</plist>

data/conf/osx/createpackage.sh

@@ -0,0 +1,167 @@
+#!/bin/bash
+#
+# Script to build an "old style" not flat pkg out of the puppet repository.
+#
+# Author: Nigel Kersten (nigelk@google.com)
+#
+# Last Updated: 2008-07-31
+#
+# Copyright 2008 Google Inc.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+
+INSTALLRB="install.rb"
+BINDIR="/usr/bin"
+SITELIBDIR="/usr/lib/ruby/site_ruby/1.8"
+PACKAGEMAKER="/Developer/usr/bin/packagemaker"
+PROTO_PLIST="PackageInfo.plist"
+PREFLIGHT="preflight"
+
+
+function find_installer() {
+  # we walk up three directories to make this executable from the root, 
+  # root/conf or root/conf/osx
+  if [ -f "./${INSTALLRB}" ]; then
+    installer="$(pwd)/${INSTALLRB}"
+  elif [ -f "../${INSTALLRB}" ]; then
+    installer="$(pwd)/../${INSTALLRB}"
+  elif [ -f "../../${INSTALLRB}" ]; then
+    installer="$(pwd)/../${INSTALLRB}"
+  else
+    installer=""
+  fi
+}
+
+function find_puppet_root() {
+  puppet_root=$(dirname "${installer}")
+}
+
+function install_puppet() {
+  echo "Installing Puppet to ${pkgroot}"
+  "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}"
+  chown -R root:admin "${pkgroot}"
+}
+
+function get_puppet_version() {
+  puppet_version=$(RUBYLIB="${pkgroot}/${SITELIBDIR}:${RUBYLIB}" ruby -e "require 'puppet'; puts Puppet.version")
+}
+
+function prepare_package() {
+  # As we can't specify to follow symlinks from the command line, we have
+  # to go through the hassle of creating an Info.plist file for packagemaker
+  # to look at for package creation and substitue the version strings out.
+  # Major/Minor versions can only be integers, so we have "0" and "245" for
+  # puppet version 0.24.5
+  # Note too that for 10.5 compatibility this Info.plist *must* be set to 
+  # follow symlinks.
+  VER1=$(echo ${puppet_version} | awk -F "." '{print $1}')
+  VER2=$(echo ${puppet_version} | awk -F "." '{print $2}')
+  VER3=$(echo ${puppet_version} | awk -F "." '{print $3}')
+  major_version="${VER1}"
+  minor_version="${VER2}${VER3}"
+  cp "${puppet_root}/conf/osx/${PROTO_PLIST}" "${pkgtemp}"
+  sed -i '' "s/{SHORTVERSION}/${puppet_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  sed -i '' "s/{MAJORVERSION}/${major_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  sed -i '' "s/{MINORVERSION}/${minor_version}/g" "${pkgtemp}/${PROTO_PLIST}"
+  
+  # We need to create a preflight script to remove traces of previous
+  # puppet installs due to limitations in Apple's pkg format.
+  mkdir "${pkgtemp}/scripts"
+  cp "${puppet_root}/conf/osx/${PREFLIGHT}" "${pkgtemp}/scripts"
+  
+  # substitute in the sitelibdir specified above on the assumption that this
+  # is where any previous puppet install exists that should be cleaned out.
+  sed -i '' "s|{SITELIBDIR}|${SITELIBDIR}|g" "${pkgtemp}/scripts/${PREFLIGHT}"
+  chmod 0755 "${pkgtemp}/scripts/${PREFLIGHT}"
+}
+
+function create_package() {
+  rm -fr "$(pwd)/puppet-${puppet_version}.pkg"
+  echo "Building package"
+  echo "Note that packagemaker is reknowned for spurious errors. Don't panic."
+  "${PACKAGEMAKER}" --root "${pkgroot}" \
+                    --info "${pkgtemp}/${PROTO_PLIST}" \
+                    --scripts ${pkgtemp}/scripts \
+                    --out "$(pwd)/puppet-${puppet_version}.pkg"
+  if [ $? -ne 0 ]; then
+    echo "There was a problem building the package."
+    cleanup_and_exit 1
+    exit 1
+  else
+    echo "The package has been built at:"
+    echo "$(pwd)/puppet-${puppet_version}.pkg"
+  fi
+}
+
+function cleanup_and_exit() {
+  if [ -d "${pkgroot}" ]; then
+    rm -fr "${pkgroot}"
+  fi
+  if [ -d "${pkgtemp}" ]; then
+    rm -fr "${pkgtemp}"
+  fi
+  exit $1
+}
+
+# Program entry point
+function main() {
+
+  if [ $(whoami) != "root" ]; then
+    echo "This script needs to be run as root via su or sudo."
+    cleanup_and_exit 1
+  fi
+
+  find_installer
+  
+  if [ ! "${installer}" ]; then
+    echo "Unable to find ${INSTALLRB}"
+    cleanup_and_exit 1
+  fi
+
+  find_puppet_root
+  
+  if [ ! "${puppet_root}" ]; then
+    echo "Unable to find puppet repository root."
+    cleanup_and_exit 1
+  fi
+  
+  pkgroot=$(mktemp -d -t puppetpkg)
+  
+  if [ ! "${pkgroot}" ]; then
+    echo "Unable to create temporary package root."
+    cleanup_and_exit 1
+  fi
+  
+  pkgtemp=$(mktemp -d -t puppettmp)
+  
+  if [ ! "${pkgtemp}" ]; then
+    echo "Unable to create temporary package root."
+    cleanup_and_exit 1
+  fi
+  
+  install_puppet
+  get_puppet_version
+  
+  if [ ! "${puppet_version}" ]; then
+    echo "Unable to retrieve puppet version"
+    cleanup_and_exit 1
+  fi
+  
+  prepare_package
+  create_package
+  
+  cleanup_and_exit 0
+}
+
+main "$@"

data/conf/osx/preflight

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Make sure that old puppet cruft is removed
+# This also allows us to downgrade puppet as
+# it's more likely that installing old versions
+# over new will cause issues.
+#
+# ${3} is the destination volume so that this works correctly
+# when being installed to volumes other than the current OS.
+
+/bin/rm -Rf "${3}{SITELIBDIR}/puppet"
+/bin/rm -Rf "${3}{SITELIBDIR}/puppet.rb"

data/conf/redhat/client.init

@@ -84,7 +84,7 @@ case "$1" in
 	[ -f "$pidfile" ] && restart
 	;;
   status)
-        status $puppetd
+        status -p "$pidfile" $puppetd
         RETVAL=$?
 	;;
   once)

data/conf/redhat/puppet.spec

@@ -2,12 +2,12 @@
 %define pbuild %{_builddir}/%{name}-%{version}
 %define confdir conf/redhat
 
-%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5
+%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5 || 0%{?centos:%centos} >= 5
 %define has_ruby_noarch %has_ruby_abi
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.24.5
+Version: 0.24.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
@@ -51,8 +51,8 @@ done
 # Fix some rpmlint complaints
 for f in mac_dscl.pp mac_dscl_revert.pp \
          mac_netinfo.pp mac_pkgdmg.pp ; do
-  sed -i -e'1d' examples/code/$f
-  chmod a-x examples/code/$f
+  sed -i -e'1d' examples/$f
+  chmod a-x examples/$f
 done
 
 find examples/ -type f -empty | xargs rm
@@ -65,6 +65,7 @@ install -d -m0755 %{buildroot}%{_bindir}
 install -d -m0755 %{buildroot}%{ruby_sitelibdir}
 install -d -m0755 %{buildroot}%{_sysconfdir}/puppet/manifests
 install -d -m0755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m0755 %{buildroot}%{_mandir}/man8
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 install -d -m0755 %{buildroot}%{_localstatedir}/log/puppet
@@ -73,6 +74,7 @@ mv %{buildroot}%{_sbindir}/puppet %{buildroot}%{_bindir}/puppet
 mv %{buildroot}%{_sbindir}/ralsh %{buildroot}%{_bindir}/ralsh
 mv %{buildroot}%{_sbindir}/filebucket %{buildroot}%{_bindir}/filebucket
 mv %{buildroot}%{_sbindir}/puppetrun %{buildroot}%{_bindir}/puppetrun
+mv %{buildroot}%{_sbindir}/puppetdoc %{buildroot}%{_bindir}/puppetdoc
 install -Dp -m0644 %{pbuild}/lib/puppet.rb %{buildroot}%{ruby_sitelibdir}/puppet.rb
 cp -a %{pbuild}/lib/puppet %{buildroot}%{ruby_sitelibdir}
 find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r chmod a-x
@@ -83,6 +85,7 @@ install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster
 install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf
 install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf
 install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet
+install -Dp -m0644 man/man8/* %{buildroot}%{_mandir}/man8
 # We need something for these ghosted files, otherwise rpmbuild
 # will complain loudly. They won't be included in the binary packages
 touch %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf
@@ -94,6 +97,8 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %{_bindir}/puppet
 %{_bindir}/ralsh
 %{_bindir}/filebucket
+%{_bindir}/puppetdoc
+%exclude %{_mandir}/man8/pi.8.gz
 %{_sbindir}/puppetd
 %{ruby_sitelibdir}/*
 %{_initrddir}/puppet
@@ -102,13 +107,17 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf
 %doc CHANGELOG COPYING LICENSE README examples
-%exclude %{_sbindir}/puppetdoc
 %config(noreplace) %{_sysconfdir}/logrotate.d/puppet
 # These need to be owned by puppet so the server can
 # write to them
 %attr(-, puppet, puppet) %{_localstatedir}/run/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/log/puppet
 %attr(-, puppet, puppet) %{_localstatedir}/lib/puppet
+%doc %{_mandir}/man8/puppet.8.gz
+%doc %{_mandir}/man8/puppet.conf.8.gz
+%doc %{_mandir}/man8/puppetd.8.gz
+%doc %{_mandir}/man8/ralsh.8.gz
+%doc %{_mandir}/man8/puppetdoc.8.gz
 
 %files server
 %defattr(-, root, root, 0755)
@@ -121,6 +130,10 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf
 %ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf
 %{_sbindir}/puppetca
+%doc %{_mandir}/man8/filebucket.8.gz
+%doc %{_mandir}/man8/puppetca.8.gz
+%doc %{_mandir}/man8/puppetmasterd.8.gz
+%doc %{_mandir}/man8/puppetrun.8.gz
 
 %pre
 /usr/sbin/groupadd -r puppet 2>/dev/null || :
@@ -157,7 +170,22 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Mon Jul 22 2008 James Turnbull <james@lovedthanlost.net> - 0.24.5-1
+* Mon Jul 28 2008 David Lutterkort <dlutter@redhat.com> - 0.24.5-1
+- Add /usr/bin/puppetdoc
+
+* Thu Jul 24 2008 Brenton Leanhardt <bleanhar@redhat.com>
+- New version
+- man pages now ship with tarball
+- examples/code moved to root examples dir in upstream tarball
+
+* Tue Mar 25 2008 David Lutterkort <dlutter@redhat.com> - 0.24.4-1
+- Add man pages (from separate tarball, upstream will fix to
+  include in main tarball)
+
+* Mon Mar 24 2008 David Lutterkort <dlutter@redhat.com> - 0.24.3-1
+- New version
+
+* Wed Mar  5 2008 David Lutterkort <dlutter@redhat.com> - 0.24.2-1
 - New version
 
 * Sat Dec 22 2007 David Lutterkort <dlutter@redhat.com> - 0.24.1-1

data/conf/redhat/server.init

@@ -1,7 +1,8 @@
 #!/bin/bash
 # puppetmaster  This shell script enables the puppetmaster server.
 #
-# Author:       Duane Griffin <d.griffin@psenterprise.com>
+# Authors:       Duane Griffin <d.griffin@psenterprise.com>
+#                Peter Meier <peter.meier@immerda.ch> (Mongrel enhancements)
 #
 # chkconfig: - 65 45
 #
@@ -22,6 +23,11 @@ fi
 
 PUPPETMASTER_OPTS=""
 [ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
+elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}" 
+fi
 [ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}"
 PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
 	${PUPPETMASTER_EXTRA_OPTS}"
@@ -36,8 +42,16 @@ start() {
 
 	# Confirm the manifest exists
 	if [ -r $PUPPETMASTER_MANIFEST ]; then
-		daemon $PUPPETMASTER $PUPPETMASTER_OPTS
-		RETVAL=$?
+        if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+            for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
+                echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
+                daemon $PUPPETMASTER $PUPPETMASTER_OPTS --masterport=${PUPPETMASTER_PORTS[$i]} --pidfile=/var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid
+                ret=$?; [ $ret != 0 ] && RETVAL=$ret
+            done
+        else
+            daemon $PUPPETMASTER $PUPPETMASTER_OPTS
+            RETVAL=$?
+        fi
 	else
 		failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST"
 		echo
@@ -50,8 +64,16 @@ start() {
 
 stop() {
 	echo -n  $"Stopping puppetmaster: "
-	killproc $PUPPETMASTER
-	RETVAL=$?
+    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
+            echo -en "\nPort: ${PUPPETMASTER_PORTS[$i]}"
+            killproc -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster 
+            ret=$?; [ $ret != 0 ] && RETVAL=$ret
+        done
+    else
+       killproc $PUPPETMASTER
+       RETVAL=$?
+    fi
 	echo
 	[ $RETVAL -eq 0 ] && rm -f "$lockfile"
 	return $RETVAL
@@ -67,6 +89,20 @@ genconfig() {
   $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig
 }
 
+puppetmaster_status() {
+    if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+        for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do
+            echo -en "Port ${PUPPETMASTER_PORTS[$i]}: "
+            status -p /var/run/puppet/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid puppetmaster 
+            ret=$?; [ $ret != 0 ] && RETVAL=$ret
+        done 
+    else
+	    status $PUPPETMASTER
+        RETVAL=$?
+    fi
+    return $RETVAL
+}
+
 case "$1" in
   start)
 	start
@@ -81,8 +117,7 @@ case "$1" in
 	[ -f "$lockfile" ] && restart
 	;;
   status)
-	status $PUPPETMASTER
-        RETVAL=$?
+    puppetmaster_status
 	;;
   genconfig)
 	genconfig

data/conf/redhat/server.sysconfig

@@ -5,5 +5,27 @@
 # Specify syslog to send log messages to the system log.
 #PUPPETMASTER_LOG=syslog
 
+# You may specify an alternate port or an array of ports on which 
+# puppetmaster should listen. Default is: 8140
+# If you specify more than one port, the puppetmaster ist automatically
+# started with the servertype set to mongrel. This might be interesting
+# if you'd like to run your puppetmaster in a loadbalanced cluster.
+# Please note: this won't setup nor start any loadbalancer. 
+# If you'd like to run puppetmaster with mongrel as servertype but only
+# on one (specified) port, you have to add --servertype=mongrel to
+# PUPPETMASTER_EXTRA_OPTS.
+# Default: Empty (Puppetmaster isn't started with mongrel, nor on a 
+# specific port)
+#
+# Please note: Due to reduced options in the rc-functions lib in RHEL/Centos
+# versions prior to 5, this feature won't work. Fedora versions >= 8 are 
+# known to work.
+#PUPPETMASTER_PORTS=""
+# Puppetmaster on a different port, run with standard webrick servertype
+#PUPPETMASTER_PORTS="8141"
+# Example with multiple ports which will start puppetmaster with mongrel
+# as a servertype
+#PUPPETMASTER_PORTS=( 18140 18141 18142 18143 )
+
 # You may specify other parameters to the puppetmaster here
 #PUPPETMASTER_EXTRA_OPTS=--noca