puppet 0.18.4 → 0.22.4

data/conf/gentoo/init.d/puppetmaster

@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+depend() {
+        need net
+        use dns logger
+}
+
+checkconfig() {
+        if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then
+               eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory"
+               return 1
+        fi
+
+        local site_manifest="/etc/puppet/manifests/site.pp"
+        [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}"
+
+        if [ ! -f "${site_manifest}" ] ; then
+                eerror "Please create ${site_manifest} before running puppet"
+                return 1
+        fi
+
+        return 0
+}
+
+start() {
+        checkconfig || return $?
+
+        local options=""
+        [[ -n "${PUPPETMASTER_MANIFEST}" ]]   && options="${options} --manifest=${PUPPETMASTER_MANIFEST}"
+        [[ -n "${PUPPETMASTER_LOG}" ]]        && options="${options} --logdest=${PUPPETMASTER_LOG}"
+        [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
+
+        ebegin "Starting puppetmaster"
+        start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
+                -- ${options}
+        eend $? "Failed to start puppetmaster"
+}
+
+stop() {
+        ebegin "Stopping puppetmaster"
+        start-stop-daemon --stop --quiet \
+                --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+        local ret=$?
+        eend ${ret} "Failed to stop puppetmaster"
+        rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+        return ${ret}
+}

data/conf/gentoo/puppet/fileserver.conf

@@ -0,0 +1,12 @@
+# This file consists of arbitrarily named sections/modules
+# defining where files are served from and to whom
+
+# Define a section 'files'
+# Adapt the allow/deny settings to your needs. Order
+# for allow/deny does not matter, allow always takes precedence
+# over deny
+[files]
+  path /var/lib/puppet/files
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24

data/conf/gentoo/puppet/puppetca.conf

@@ -0,0 +1,29 @@
+[puppet]
+    # Where Puppet stores dynamic and growing data.
+    # The default value is '/var/puppet'.
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+[puppetd]
+    # 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``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig

data/conf/gentoo/puppet/puppetd.conf

@@ -0,0 +1,29 @@
+[puppet]
+    # Where Puppet stores dynamic and growing data.
+    # The default value is '/var/puppet'.
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+[puppetd]
+    # 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``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig

data/conf/gentoo/puppet/puppetmasterd.conf

@@ -0,0 +1,29 @@
+[puppet]
+    # Where Puppet stores dynamic and growing data.
+    # The default value is '/var/puppet'.
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+[puppetd]
+    # 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``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig

data/conf/redhat/client.init

@@ -49,7 +49,7 @@ stop() {
 	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 
-restart() {
+reload() {
 	echo -n $"Restarting puppet: "
         killproc $puppetd -HUP
 	RETVAL=$?
@@ -57,6 +57,11 @@ restart() {
 	return $RETVAL
 }
 
+restart() {
+    stop
+    start
+}
+
 case "$1" in
   start)
 	start
@@ -64,13 +69,13 @@ case "$1" in
   stop) 
 	stop
 	;;
-  restart|force-reload)
+  restart)
 	restart
 	;;
-  reload)
-        restart
+  reload|force-reload)
+        reload
 	;;
-  condrestart)
+  condrestart|try-restart)
 	[ -f "$pidfile" ] && restart
 	;;
   status)

data/conf/redhat/client.sysconfig

@@ -5,7 +5,7 @@
 #PUPPET_PORT=8140
 
 # Where to log to. Specify syslog to send log messages to the system log.
-PUPPET_LOG=/var/log/puppet/puppet.log
+#PUPPET_LOG=/var/log/puppet/puppet.log
 
 # You may specify other parameters to the puppet client here
 #PUPPET_EXTRA_OPTS=--waitforcert=500

data/conf/redhat/fileserver.conf

@@ -5,8 +5,8 @@
 # Adapt the allow/deny settings to your needs. Order
 # for allow/deny does not matter, allow always takes precedence
 # over deny
-[files]
-  path /var/lib/puppet/files
+# [files]
+#  path /var/lib/puppet/files
 #  allow *.example.com
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24

data/conf/redhat/logrotate

@@ -3,6 +3,6 @@
   create 0644 puppet puppet
   postrotate
     [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true
-    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet condrestart > /dev/null 2>&1 || true
+    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
   endscript
 }

data/conf/redhat/no-lockdir.patch

@@ -0,0 +1,13 @@
+--- puppet-0.22.1/conf/redhat/puppetd.conf.orig	2006-09-27 10:30:35.000000000 -0700
++++ puppet-0.22.1/conf/redhat/puppetd.conf	2007-02-11 13:27:04.000000000 -0800
+@@ -11,10 +11,6 @@
+     # The default value is '$vardir/run'.
+     rundir = /var/run/puppet
+ 
+-    # Where lock files are kept.
+-    # The default value is '$vardir/locks'.
+-    lockdir = /var/lock
+-
+     # Where SSL certificates are kept.
+     # The default value is '$confdir/ssl'.
+     ssldir = $vardir/ssl

data/conf/redhat/puppet.spec

@@ -2,9 +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_noarch %has_ruby_abi
+
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 0.18.4
+Version: 0.22.4
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -13,10 +16,14 @@ URL: http://reductivelabs.com/projects/puppet/
 Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
 
 Requires: ruby >= 1.8.1
+%if %has_ruby_abi
 Requires: ruby(abi) = 1.8
+%endif
 Requires: facter >= 1.1.4
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %has_ruby_noarch
 BuildArchitectures: noarch
+%endif
 BuildRequires: ruby >= 1.8.1
 
 %description
@@ -37,6 +44,11 @@ The server can also function as a certificate authority and file server.
 %prep
 %setup -q
 
+%build
+for f in bin/* ; do 
+  sed -i -e '1c#!/usr/bin/ruby' $f
+done
+
 %install
 %{__rm} -rf %{buildroot}
 %{__install} -d -m0755 %{buildroot}%{_sbindir}
@@ -92,8 +104,10 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r %
 %pre
 /usr/sbin/groupadd -r puppet 2>/dev/null || :
 /usr/sbin/useradd -g puppet -c "Puppet" \
-    -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || :
-
+    -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || :
+if [ $1 -gt 1 ] ; then
+  /usr/sbin/usermod -d /var/lib/puppet puppet || :
+fi
 %post
 /sbin/chkconfig --add puppet
 exit 0
@@ -103,25 +117,68 @@ exit 0
 
 %preun
 if [ "$1" = 0 ] ; then
-	/sbin/service puppet stop > /dev/null 2>&1
-	/sbin/chkconfig --del puppet
+  /sbin/service puppet stop > /dev/null 2>&1
+  /sbin/chkconfig --del puppet
 fi
 
 %preun server
 if [ "$1" = 0 ] ; then
-	/sbin/service puppetmaster stop > /dev/null 2>&1
-	/sbin/chkconfig --del puppetmaster
+  /sbin/service puppetmaster stop > /dev/null 2>&1
+  /sbin/chkconfig --del puppetmaster
 fi
 
 %postun server
 if [ "$1" -ge 1 ]; then
-	 /sbin/service puppetmaster condrestart > /dev/null 2>&1
+  /sbin/service puppetmaster condrestart > /dev/null 2>&1
 fi
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Mar 19 2007 David Lutterkort <dlutter@redhat.com> - 0.22.2-1
+- Set puppet's homedir to /var/lib/puppet, not /var/puppet
+- Remove no-lockdir patch, not needed anymore
+
+* Mon Feb 12 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-2
+- Fix bogus config parameter in puppetd.conf
+
+* Sat Feb  3 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-1
+- New version
+
+* Fri Jan  5 2007 David Lutterkort <dlutter@redhat.com> - 0.22.0-1
+- New version
+
+* Mon Nov 20 2006 David Lutterkort <dlutter@redhat.com> - 0.20.1-2
+- Make require ruby(abi) and buildarch: noarch conditional for fedora 5 or
+  later to allow building on older fedora releases
+
+* Mon Nov 13 2006 David Lutterkort <dlutter@redhat.com> - 0.20.1-1
+- New version
+
+* Mon Oct 23 2006 David Lutterkort <dlutter@redhat.com> - 0.20.0-1
+- New version
+
+* Tue Sep 26 2006 David Lutterkort <dlutter@redhat.com> - 0.19.3-1
+- New version
+
+* Mon Sep 18 2006 David Lutterkort <dlutter@redhat.com> - 0.19.1-1
+- New version
+
+* Thu Sep  7 2006 David Lutterkort <dlutter@redhat.com> - 0.19.0-1
+- New version
+
+* Tue Aug  1 2006 David Lutterkort <dlutter@redhat.com> - 0.18.4-2
+- Use /usr/bin/ruby directly instead of /usr/bin/env ruby in
+  executables. Otherwise, initscripts break since pidof can't find the
+  right process
+
+* Tue Aug  1 2006 David Lutterkort <dlutter@redhat.com> - 0.18.4-1
+- New version
+
+* Fri Jul 14 2006 David Lutterkort <dlutter@redhat.com> - 0.18.3-1
+- New version
+
 * Wed Jul  5 2006 David Lutterkort <dlutter@redhat.com> - 0.18.2-1
 - New version
 

data/conf/redhat/puppetd.conf

@@ -11,10 +11,6 @@
     # The default value is '$vardir/run'.
     rundir = /var/run/puppet
 
-    # Where lock files are kept.
-    # The default value is '$vardir/locks'.
-    lockdir = /var/lock
-
     # Where SSL certificates are kept.
     # The default value is '$confdir/ssl'.
     ssldir = $vardir/ssl

data/conf/redhat/server.init

@@ -59,11 +59,8 @@ stop() {
 }
 
 restart() {
-	echo -n $"Restarting puppet: "
-        killproc $PUPPETMASTER -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
+  stop
+  start
 }
 
 case "$1" in
@@ -74,7 +71,7 @@ case "$1" in
 	stop
 	;;
   restart|reload|force-reload)
-	restart
+        restart
 	;;
   condrestart)
 	[ -f "$lockfile" ] && restart

data/conf/solaris/pkginfo

@@ -1,6 +1,6 @@
 PKG=CSWpuppet
 NAME=puppet - System Automation Framework
-VERSION=0.18.4
+VERSION=0.22.4
 CATEGORY=application
 VENDOR=http://reductivelabs.com/projects/puppet
 HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi

data/conf/solaris/smf/svc-puppetd

@@ -10,7 +10,7 @@
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
-sbindir=/opt/csw/sbin
+sbindir=/opt/csw/bin
 
 pidfile=/var/puppet/run/puppetd.pid
 
@@ -63,4 +63,4 @@ status)
 esac
 exit 0
 
-# $Id: svc-puppetd 1403 2006-07-18 23:34:29Z luke $
+# $Id: svc-puppetd 1796 2006-10-17 06:09:41Z luke $

data/conf/suse/client.init

@@ -0,0 +1,142 @@
+#!/bin/bash
+# puppet        Init script for running the puppet client daemon
+#
+# Author:       Duane Griffin <d.griffin@psenterprise.com>
+#               David Lutterkort <dlutter@redhat.com>
+#               Martin Vuk <martin.vuk@fri.uni-lj.si> (SuSE support)
+#
+# chkconfig: - 98 02
+#
+# description: Enables periodic system configuration checks through puppet.
+# processname: puppet
+# config: /etc/sysconfig/puppet
+
+### BEGIN INIT INFO
+# Provides: puppet
+# Required-Start: $local_fs $network $syslog
+# Should-Start: 
+# Required-Stop:
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: puppet
+# Description: Enables periodic system configuration checks through puppet.
+### END INIT INFO
+
+# Shell functions sourced from /etc/rc.status:
+#      rc_check         check and set local and overall rc status
+#      rc_status        check and set local and overall rc status
+#      rc_status -v     ditto but be verbose in local rc status
+#      rc_status -v -r  ditto and clear the local rc status
+#      rc_failed        set local and overall rc status to failed
+#      rc_reset         clear local rc status (overall remains)
+#      rc_exit          exit appropriate to overall rc status
+[ -f /etc/rc.status ] && . /etc/rc.status
+[ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
+lockfile=${LOCKFILE-/var/lock/subsys/puppet}
+pidfile=${PIDFILE-/var/run/puppet.pid}
+puppetd=${PUPPETD-/usr/sbin/puppetd}
+
+PUPPET_OPTS=""
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
+[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
+
+# First reset status of this service
+rc_reset
+
+# Return values acc. to LSB for all commands but status:
+# 0 - success
+# 1 - misc error
+# 2 - invalid or excess args
+# 3 - unimplemented feature (e.g. reload)
+# 4 - insufficient privilege
+# 5 - program not installed
+# 6 - program not configured
+#
+# Note that starting an already running service, stopping
+# or restarting a not-running service as well as the restart
+# with force-reload (in case signalling is not supported) are
+# considered a success.
+
+case "$1" in
+    start)
+        echo -n "Starting puppet services."
+        ## Start daemon with startproc(8). If this fails
+        ## the echo return value is set appropriate.
+
+        # startproc should return 0, even if service is
+        # already running to match LSB spec.
+	startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
+        # Remember status and be verbose
+        rc_status -v
+        ;;
+    stop)
+        echo -n "Shutting down puppet:"
+        ## Stop daemon with killproc(8) and if this fails
+        ## set echo the echo return value.
+
+        killproc -QUIT $puppetd && rm -f ${lockfile} ${pidfile}
+
+        # Remember status and be verbose
+        rc_status -v
+        ;;
+    try-restart)
+        ## Stop the service and if this succeeds (i.e. the
+        ## service was running before), start it again.
+        $0 status >/dev/null &&  $0 restart
+
+        # Remember status and be quiet
+        rc_status
+        ;;
+    restart)
+        ## Stop the service and regardless of whether it was
+        ## running or not, start it again.
+        $0 stop
+        $0 start
+
+        # Remember status and be quiet
+        rc_status
+        ;;
+    force-reload)
+        ## Signal the daemon to reload its config. Most daemons
+        ## do this on signal 1 (SIGHUP).
+        ## If it does not support it, restart.
+
+        echo -n "Reload service puppet"
+        ## if it supports it:
+        killproc -HUP $puppetd
+        rc_status -v
+        ;;
+    reload)
+        ## Like force-reload, but if daemon does not support
+        ## signalling, do nothing (!)
+
+        # If it supports signalling:
+	echo -n "Reload puppet services."
+	killproc -HUP  $puppetd
+        rc_status -v
+        ;;
+    status)
+        echo -n "Checking for service puppetd: "
+        ## Check status with checkproc(8), if process is running
+        ## checkproc will return with exit status 0.
+
+        # Status has a slightly different for the status command:
+        # 0 - service running
+        # 1 - service dead, but /var/run/  pid  file exists
+        # 2 - service dead, but /var/lock/ lock file exists
+        # 3 - service not running
+
+        # NOTE: checkproc returns LSB compliant status values.
+        checkproc $puppetd
+        rc_status -v
+        ;;
+    once)
+        shift
+        $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|once}"
+        exit 1
+esac
+rc_exit