puppet 0.24.4 → 0.24.5

data/conf/debian/puppet.init

@@ -0,0 +1,64 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/puppetd
+DAEMON_OPTS="-w 0"
+NAME=puppetd
+DESC="puppet configuration management tool"
+
+test -x $DAEMON || exit 0
+
+[ -r /etc/default/puppet ] && . /etc/default/puppet
+
+. /lib/lsb/init-functions
+
+reload_puppet() {
+	start-stop-daemon --stop --quiet --signal HUP --pidfile /var/run/puppet/$NAME.pid
+}
+
+start_puppet() {
+	start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \
+		--startas $DAEMON -- $DAEMON_OPTS
+}
+
+stop_puppet() {
+	start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid
+}
+
+if [ ! -d /var/run/puppet ]; then
+	rm -rf /var/run/puppet
+	mkdir -p /var/run/puppet
+fi
+
+chown puppet:puppet /var/run/puppet
+
+case "$1" in
+    start)
+	log_begin_msg "Starting $DESC"
+	start_puppet
+	log_end_msg 0
+	;;
+    stop)
+	log_begin_msg "Stopping $DESC"
+	stop_puppet
+	log_end_msg 0
+	;;
+    reload)
+    	log_begin_msg "Reloading $DESC"
+    	reload_puppet
+    	log_end_msg 0
+    	;;
+    restart|force-reload)
+	log_begin_msg "Restarting $DESC"
+	stop_puppet
+	sleep 1
+	start_puppet
+	log_end_msg 0
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload|reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

data/conf/debian/puppet.logrotate

@@ -0,0 +1,11 @@
+/var/log/puppet/*log {
+  missingok
+  create 0644 puppet puppet
+  compress
+  rotate 4
+  
+  postrotate
+    [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster restart >/dev/null 2>&1 || true
+    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
+  endscript
+}

data/conf/debian/puppet.postinst

@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	if [ -d /etc/puppet/ssl ] && [ ! -e /var/lib/puppet/ssl ] && grep -q 'ssldir=/var/lib/puppet/ssl' /etc/puppet/puppet.conf; then
+		mv /etc/puppet/ssl /var/lib/puppet/ssl
+	fi
+fi
+
+#DEBHELPER#

data/conf/debian/puppet.postrm

@@ -0,0 +1,21 @@
+#! /bin/sh
+
+case "$1" in
+    purge)
+	rm -rf /var/lib/puppet
+	/usr/sbin/deluser --system puppet
+	;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+#DEBHELPER#
+
+exit 0

data/conf/debian/puppet.preinst

@@ -0,0 +1,25 @@
+#! /bin/sh
+
+case "$1" in
+    install|upgrade)
+	/usr/sbin/adduser --system \
+	    --group \
+	    --home /var/lib/puppet \
+	    --gecos "Puppet configuration management daemon" \
+	    puppet > /dev/null
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+

data/conf/debian/puppetmaster.files

@@ -0,0 +1,4 @@
+usr/sbin/puppetmasterd
+usr/sbin/puppetca
+usr/sbin/puppetrun
+etc/puppet/

data/conf/debian/puppetmaster.init

@@ -0,0 +1,58 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/puppetmasterd
+DAEMON_OPTS=""
+NAME=puppetmasterd
+DESC="puppet configuration management tool master server"
+
+test -x $DAEMON || exit 0
+
+[ -r /etc/default/puppetmaster ] && . /etc/default/puppetmaster
+
+. /lib/lsb/init-functions
+
+if [ ! -d /var/run/puppet ]; then
+	rm -rf /var/run/puppet
+	mkdir -p /var/run/puppet
+fi
+
+chown puppet:puppet /var/run/puppet
+
+start_puppetmaster() {
+	start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \
+		--startas $DAEMON -- $DAEMON_OPTS
+}
+
+stop_puppetmaster() {
+	start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid
+}
+
+case "$1" in
+    start)
+	log_begin_msg "Starting $DESC"
+	start_puppetmaster
+	log_end_msg $?
+	;;
+    stop)
+	log_begin_msg "Stopping $DESC"
+	stop_puppetmaster
+	log_end_msg $?
+	;;
+  reload)
+  	# Do nothing, as Puppetmaster rechecks its config automatically
+        ;;
+  restart|force-reload)
+	log_begin_msg "Restarting $DESC"
+	stop_puppetmaster
+	sleep 1
+	start_puppetmaster
+	log_end_msg 0
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

data/conf/debian/rules

@@ -0,0 +1,115 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+INSTALL=install -Dp
+
+prefix := $(CURDIR)/debian/tmp
+bindir := $(prefix)/usr/bin
+sbindir := $(prefix)/usr/sbin
+libdir := $(prefix)/usr/lib
+localstatedir := $(prefix)/var
+rubylibdir := $(libdir)/ruby/1.8
+sysconfdir := $(prefix)/etc
+pkgconfdir := $(sysconfdir)/puppet
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# ripped from the redhat spec
+	# this sucks, who wants to maintain this?
+	# note to self, fix the install.rb to handle DESTDIR and change
+	# library path
+	install -d -m0755 $(sbindir)
+	install -d -m0755 $(bindir)
+	install -d -m0755 $(rubylibdir)
+	install -d -m0755 $(pkgconfdir)/manifests
+	install -d -m0755 $(localstatedir)/lib/puppet
+	install -d -m0755 $(localstatedir)/run
+	install -d -m0755 $(localstatedir)/log/puppet
+
+	$(INSTALL) -m0755 bin/puppet bin/puppetdoc $(bindir)
+	$(INSTALL) -m0755 bin/puppetd bin/puppetmasterd bin/puppetca bin/puppetrun $(sbindir)
+	$(INSTALL) -m0644 lib/puppet.rb $(rubylibdir)/puppet.rb
+	cp -a lib/puppet $(rubylibdir)
+	find $(rubylibdir) -type f -perm +ugo+x -exec chmod a-x {} \;
+
+	$(INSTALL) -m0644 debian/fileserver.conf $(pkgconfdir)/fileserver.conf
+	$(INSTALL) -m0644 debian/puppet.conf $(pkgconfdir)/puppet.conf
+
+	# Vim auto-syntax-highlighting stuff
+	$(INSTALL) -m0644 ext/vim/syntax/puppet.vim				\
+		$(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/
+	$(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim				\
+		$(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/
+
+	# Emacs keeping up with the Joneses
+	$(INSTALL) -m0644 ext/emacs/puppet-mode-init.el			\
+		$(CURDIR)/debian/puppet/etc/emacs/site-start.d/50puppet-mode-init.el
+	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
+		$(CURDIR)/debian/puppet/usr/share/emacs/site-lisp/puppet-mode.el
+
+	dh_installexamples examples/*
+
+	# Logcheck rules.  Gee I wish you could specify a file to source
+	# in dh_installlogcheck.
+	cp ext/logcheck/puppet debian/puppet.logcheck.ignore.server
+	cp ext/logcheck/puppet debian/puppet.logcheck.ignore.workstation
+	dh_installlogcheck
+	rm debian/puppet.logcheck.*
+
+	# Clean out any SVN cruft that may still be lingering in our
+	# packages
+	find debian/tmp debian/puppet debian/puppetmaster -name .svn |xargs rm -rf
+
+# Build architecture-dependent files here.
+binary-arch: build install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_movefiles -i
+	dh_installchangelogs -i CHANGELOG
+	dh_installdocs -i
+	dh_installinit -ppuppetmaster
+	dh_installinit -ppuppet -- defaults 21
+	dh_installlogrotate -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

data/conf/debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://reductivelabs.com/downloads/puppet/puppet-([0-9]+\..*)\.tgz

data/conf/gentoo/init.d/puppet

@@ -24,7 +24,7 @@ start() {
         [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
 
         ebegin "Starting puppet"
-        start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
+        start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetd -- ${options}
         eend $? "Failed to start puppet"
 }
 

data/conf/gentoo/init.d/puppetmaster

@@ -1,50 +1,51 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header$
 
 depend() {
-        need net
-        use dns logger
+	need net
+	before puppet
+	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
+	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}"
+	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
+	if [ ! -f "${site_manifest}" ] ; then
+		eerror "Please create ${site_manifest} before running puppet"
+		return 1
+	fi
 
-        return 0
+	return 0
 }
 
 start() {
-        checkconfig || return $?
+	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}"
+	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"
+	ebegin "Starting puppetmaster"
+	start-stop-daemon --start --quiet --exec /usr/bin/ruby /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}
+	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/redhat/client.init

@@ -15,7 +15,7 @@ export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/puppet.pid}
+pidfile=${PIDFILE-/var/run/puppet/puppetd.pid}
 puppetd=${PUPPETD-/usr/sbin/puppetd}
 RETVAL=0
 
@@ -62,6 +62,11 @@ restart() {
     start
 }
 
+genconfig() {
+  echo -n $"Generate configuration puppet: "
+  $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig
+}
+
 case "$1" in
   start)
 	start
@@ -86,8 +91,11 @@ case "$1" in
         shift
         $puppetd -o ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} $@
         ;;
+  genconfig)
+	genconfig
+	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once}"
+	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
 	exit 1
 esac