puppet 2.7.19 → 2.7.20.rc1

data/ext/debian/docs

@@ -0,0 +1 @@
+README.md

data/ext/debian/fileserver.conf

@@ -0,0 +1,17 @@
+# 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 /etc/puppet/files
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24
+
+#[plugins]
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24

data/ext/debian/puppet-common.dirs

@@ -0,0 +1,8 @@
+etc/puppet
+etc/puppet/manifests
+etc/puppet/templates
+etc/puppet/modules
+usr/lib/ruby/1.8
+usr/share/puppet/ext
+var/lib/puppet
+var/log/puppet

data/ext/debian/puppet-common.install

@@ -0,0 +1,3 @@
+debian/puppet.conf etc/puppet
+debian/tmp/usr/bin/puppet usr/bin
+debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8

data/ext/debian/puppet-common.lintian-overrides

@@ -0,0 +1,7 @@
+# Man pages are automatically generated, not much to do here
+puppet-common binary: manpage-has-bad-whatis-entry
+puppet-common binary: manpage-has-errors-from-man
+# These are "scripts" but do nothing other than providing documentation
+puppet-common: script-not-executable
+# Puppet-common depends on ruby1.8, so lintian may be confused
+puppet-common: ruby-script-but-no-ruby-dep

data/ext/debian/puppet-common.manpages

@@ -0,0 +1,2 @@
+man/man5/puppet.conf.5
+man/man8/puppet.8

data/ext/debian/puppet-common.postinst

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+
+	# Create the "puppet" user
+	if ! getent passwd puppet > /dev/null; then
+		adduser --quiet --system --group --home /var/lib/puppet  \
+			--no-create-home                                 \
+			--gecos "Puppet configuration management daemon" \
+			puppet
+	fi
+
+	# Set correct permissions and ownership for puppet directories
+	if ! dpkg-statoverride --list /var/log/puppet >/dev/null 2>&1; then
+		dpkg-statoverride --update --add puppet puppet 0750 /var/log/puppet
+	fi
+
+	if ! dpkg-statoverride --list /var/lib/puppet >/dev/null 2>&1; then
+		dpkg-statoverride --update --add puppet puppet 0750 /var/lib/puppet
+	fi
+
+	# Create folders common to "puppet" and "puppetmaster", which need
+	# to be owned by the "puppet" user
+	install --owner puppet --group puppet --directory \
+		/var/lib/puppet/state
+	
+	# Handle 
+	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/ext/debian/puppet-common.postrm

@@ -0,0 +1,32 @@
+#!/bin/sh -e
+
+case "$1" in
+    purge)
+		# Remove puppetd.conf (used in > 0.24)
+		rm -f /etc/puppet/puppetd.conf
+
+		# Remove puppet state directory created by the postinst script.
+		# This directory can be removed without causing harm 
+		# according to upstream documentation.
+		rm -rf /var/lib/puppet/state
+		if [ -d /var/lib/puppet ]; then
+			rmdir --ignore-fail-on-non-empty /var/lib/puppet
+		fi
+
+		# Remove puppet log files
+		rm -rf /var/log/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/ext/debian/puppet-el.dirs

@@ -0,0 +1 @@
+usr/share/emacs/site-lisp

data/ext/debian/puppet-el.emacsen-install

@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# emacsen install script for the Debian GNU/Linux puppet-el package
+
+FLAVOR=$1
+PACKAGE=puppet-el
+
+ELDIR=/usr/share/emacs/site-lisp/
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+ELFILE="puppet-mode.el"
+FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile"
+
+if [ ${FLAVOR} != emacs ]; then
+  echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
+
+  install -m 755 -d ${ELCDIR}
+  cd ${ELDIR}
+  cp ${ELFILE} ${ELCDIR}
+  cd ${ELCDIR}
+  cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+  ${FLAVOR} ${FLAGS} ${ELFILE}
+  rm -f ${ELFILE} path.el
+fi

data/ext/debian/puppet-el.emacsen-remove

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+FLAVOR=$1
+PACKAGE=puppet-el
+ELCFILE=puppet-mode.elc
+
+if [ ${FLAVOR} != emacs ]; then
+  echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
+  rm -f /usr/share/${FLAVOR}/site-lisp/${ELCFILE}
+fi

data/ext/debian/puppet-el.emacsen-startup

@@ -0,0 +1,9 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux puppet-el package
+
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
+
+

data/ext/debian/puppet-el.install

@@ -0,0 +1 @@
+ext/emacs/puppet-mode.el usr/share/emacs/site-lisp

data/ext/debian/puppet-testsuite.install

@@ -0,0 +1,3 @@
+test/* /usr/share/puppet-testsuite/test
+spec/* /usr/share/puppet-testsuite/spec
+Rakefile /usr/share/puppet-testsuite/

data/ext/debian/puppet-testsuite.lintian-overrides

@@ -0,0 +1,4 @@
+# Upstream distributes it like this
+puppet-testsuite binary: executable-not-elf-or-script
+puppet-testsuite binary: script-not-executable
+puppet-testsuite binary: unusual-interpreter

data/ext/debian/puppet.NEWS

@@ -0,0 +1,86 @@
+puppet (0.25.4-1) unstable; urgency=low
+
+  In this packaging version we add a "puppet-common" package, on which the
+  packages "puppet" and "puppetmaster" depend.
+
+  The editor syntax highlighting code previously in the "puppet" package has
+  been moved to the packages "puppet-el" and "vim-puppet".
+
+ -- Stig Sandbeck Mathisen <ssm@debian.org>  Tue, 19 Jan 2010 13:09:36 +0000
+
+puppet (0.25.1-3) unstable; urgency=low
+
+  The default setting for puppet starting on boot has been changed from true
+  to false.  This means the puppet client will not automatically start on
+  install or boot until this file is modified.
+
+  Note that the last Debian packaged version of puppet 0.24.x is too old to
+  communicate with a 0.25.x puppetmaster server.  To resolve this, either
+  upgrade your client to 0.25.x, or install puppet 0.24.8 from source from:
+  http://puppetlabs.com/downloads/puppet/puppet-0.24.8.tgz
+
+ -- Nigel Kersten <nigel@explanatorygap.net>  Wed, 16 Dec 2009 12:49:03 -0800
+
+puppet (0.23.2-12) unstable; urgency=low
+
+  * Handling of the rundir setting has been changed; we now store PID files
+    in /var/run/puppet, and the initscripts have been modified to ensure
+    that this directory exists on startup.  It is no longer necessary to set
+    rundir explicitly in /etc/puppet/puppet.conf, and you should ensure that
+    you have no explicit rundir setting in your puppet.conf unless you want
+    to use a custom rundir setting for your own local purposes.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Sat, 20 Oct 2007 11:58:58 +1000
+
+puppet (0.23.2-3) unstable; urgency=low
+
+  * This version of Puppet makes a fairly major change to the location of
+    the CA and certificates, from /etc/puppet/ssl to the more FHS-compliant
+    location /var/lib/puppet/ssl.  This is to be both policy-compliant and
+    to match the location of the ssldir in other distributions.
+    
+    If you have transitioned to using the consolidated puppet.conf config
+    file, there should be no problems.  If you are using a stock
+    puppet.conf, the change should be made for you automatically, while if
+    you've customised puppet.conf the ssldir will be left where it is and
+    you should transition to the new location manually.
+
+    The only source of problems is if you're still using per-program config
+    files (puppetd.conf, puppetmasterd.conf, etc).  I haven't been able to
+    work out a damage-free way of transitioning to the new location, so
+    things will likely break for you -- ssldir will have been moved to
+    /var/lib/puppet/ssl, but your puppet programs will use the
+    old config file (with the default ssldir of /etc/puppet/ssl.  In this
+    case, you'll likely get all sorts of certificate-related problems.
+    
+    The solution is to either switch to using puppet.conf (which is
+    necessary anyway because support for the deprecated per-program config
+    files will be going away sometime) with the new ssldir setting, or add
+    the ssldir setting to all your per-program config files (this includes
+    creating them for programs that don't already have a config file, like
+    puppetca.conf).  Then delete /etc/puppet/ssl (since it's not needed) and
+    use the existing SSL data that was moved to /var/lib/puppet/ssl.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Fri, 24 Aug 2007 16:08:04 +1000
+
+puppet (0.23.0-1) unstable; urgency=low
+
+  * As of upstream 0.23.0, the configuration file layout has been largely
+    revamped.  Now, instead of having one file per program, there is now
+    a single file, /etc/puppet/puppet.conf, which contains sections for
+    each program, as well as a "main" section that sets global config
+    options relevant for all programs.
+    
+    See http://puppetlabs.com/trac/puppet/wiki/ConfigurationReference for
+    more info.
+    
+    For backwards compatibility, all programs still read the per-program
+    configuration files, and will ignore the generic puppet.conf file if the
+    per-program file still exists.  To prevent accidents, you will need to
+    do the configuration change manually, by rewriting puppet.conf to match
+    your local configuration parameters and then deleting the old files.  If
+    you haven't changed any config parameters, then it should be as simple
+    as deleting puppetd.conf and puppetmasterd.conf and restarting the
+    daemons, as the configuration itself hasn't changed between versions.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Mon, 25 Jun 2007 10:43:53 +1000

data/ext/debian/puppet.conf

@@ -0,0 +1,14 @@
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
+factpath=$vardir/lib/facter
+templatedir=$confdir/templates
+
+[master]
+# These are needed when the puppetmaster is run by passenger
+# and can safely be removed if webrick is used.
+ssl_client_header = SSL_CLIENT_S_DN 
+ssl_client_verify_header = SSL_CLIENT_VERIFY
+

data/ext/debian/puppet.default

@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=no
+
+# Startup options
+DAEMON_OPTS=""

data/ext/debian/puppet.dirs

@@ -0,0 +1 @@
+usr/sbin

data/ext/debian/puppet.init

@@ -0,0 +1,118 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          puppet
+# Required-Start:    $network $named $remote_fs $syslog
+# Required-Stop:     $network $named $remote_fs $syslog
+# Should-Start:      puppet
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO                                                                                                                                          
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/puppet
+DAEMON_OPTS="agent"
+NAME=agent
+DESC="puppet agent"
+PIDFILE="/var/run/puppet/${NAME}.pid"
+
+test -x $DAEMON || exit 0
+
+[ -r /etc/default/puppet ] && . /etc/default/puppet
+
+. /lib/lsb/init-functions
+
+is_true() {
+    if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+reload_puppet_agent() {
+	start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE 
+}
+
+start_puppet_agent() {
+    if is_true "$START" ; then
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+	    --startas $DAEMON -- $NAME $DAEMON_OPTS
+    else
+	echo ""
+	echo "puppet not configured to start, please edit /etc/default/puppet to enable"
+    fi
+}
+
+stop_puppet_agent() {
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+}
+
+status_puppet_agent() {
+    if (type status_of_proc > /dev/null 2>&1) ; then
+        status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
+    else
+        status_of_proc() {
+            local pidfile daemon name status
+            
+            pidfile=
+            OPTIND=1
+            while getopts p: opt ; do
+                case "$opt" in
+                    p)  pidfile="$OPTARG";;
+                esac
+            done
+            shift $(($OPTIND - 1))
+            
+            if [ -n "$pidfile" ]; then
+                pidfile="-p $pidfile"
+            fi
+            daemon="$1"
+            name="$2"
+            status="0"
+            pidofproc $pidfile $daemon >/dev/null || status="$?"
+            if [ "$status" = 0 ]; then
+                log_success_msg "$name is running"
+                return 0
+            elif [ "$status" = 4 ]; then
+                log_failure_msg "could not access PID file for $name"
+                return $status
+            else
+                log_failure_msg "$name is not running"
+                return $status
+            fi         
+        }
+	    status_of_proc -p "${PIDFILE}" "${DAEMON}" "${NAME}"
+    fi
+}
+
+case "$1" in
+    start)
+	log_begin_msg "Starting $DESC"
+	start_puppet_agent
+	log_end_msg $?
+	;;
+    stop)
+	log_begin_msg "Stopping $DESC"
+	stop_puppet_agent
+	log_end_msg $?
+	;;
+    reload)
+    	log_begin_msg "Reloading $DESC"
+        reload_puppet_agent
+    	log_end_msg $?
+    	;;
+    status)
+        status_puppet_agent
+	;;
+    restart|force-reload)
+	log_begin_msg "Restarting $DESC"
+	stop_puppet_agent
+	sleep 1
+	start_puppet_agent
+	log_end_msg $?
+	;;
+  *)
+	echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" >&2
+	exit 1
+	;;
+esac

data/ext/debian/puppet.install

@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/filebucket usr/bin
+debian/tmp/usr/bin/puppetdoc usr/bin
+debian/tmp/usr/sbin/puppetd usr/sbin
+debian/tmp/usr/bin/ralsh usr/bin

data/ext/debian/puppet.lintian-overrides

@@ -0,0 +1,3 @@
+# Man pages are automatically generated, not much to do here
+puppet binary: manpage-has-bad-whatis-entry
+puppet binary: manpage-has-errors-from-man

data/ext/debian/puppet.logrotate

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

data/ext/debian/puppet.manpages

@@ -0,0 +1,36 @@
+man/man8/filebucket.8  
+man/man8/puppetd.8  
+man/man8/puppetdoc.8  
+man/man8/ralsh.8
+man/man8/puppet-agent.8
+man/man8/puppet-apply.8
+man/man8/puppet-catalog.8
+man/man8/puppet-describe.8
+man/man8/puppet-cert.8
+man/man8/puppet-certificate.8
+man/man8/puppet-certificate_request.8
+man/man8/puppet-certificate_revocation_list.8
+man/man8/puppet-config.8
+man/man8/puppet-device.8
+man/man8/puppet-doc.8
+man/man8/puppet-facts.8
+man/man8/puppet-file.8
+man/man8/puppet-filebucket.8
+man/man8/puppet-help.8
+man/man8/puppet-inspect.8
+man/man8/puppet-instrumentation_data.8
+man/man8/puppet-instrumentation_listener.8
+man/man8/puppet-instrumentation_probe.8
+man/man8/puppet-key.8
+man/man8/puppet-kick.8
+man/man8/puppet-man.8
+man/man8/puppet-module.8
+man/man8/puppet-node.8
+man/man8/puppet-parser.8
+man/man8/puppet-plugin.8
+man/man8/puppet-queue.8
+man/man8/puppet-report.8
+man/man8/puppet-resource.8
+man/man8/puppet-resource_type.8
+man/man8/puppet-secret_agent.8
+man/man8/puppet-status.8