Adding the debian directory via patch 20070831052721-6856b-b90bb56a4ed37ea420f10352a0a366068cddc7e4.patch from womble

21 files changed, 538 insertions, 0 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000000000..49b373b40
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+The debian/ directory for this package is maintained in bzr.  There are two
+primary branches, kept by each maintainer:
+
+http://www.hezmatt.org/~mpalmer/bzr/puppet.debian (mpalmer)
+http://repo.spacepants.org/puppet/puppet.debian (jaq)
+
+Typically all the changes will be in one (or both) of these branches.  They
+merge from each other on a regular basis, and the canonical version for a
+release just depends on who actually made the upload.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
new file mode 100644
index 000000000..ac70b97be
--- /dev/null
+++ b/debian/TODO.Debian
@@ -0,0 +1 @@
+* clean up initscripts per http://mail.madstop.com/pipermail/puppet-dev/2006-June/001069.html
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..17d117769
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,124 @@
+puppet (0.23.2-3) unstable; urgency=low
+
+  * Clear the config value cache every time.  This is a titchy little
+    performance hit, but it works around puppet#776 rather nicely.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Fri, 24 Aug 2007 16:08:04 +1000
+
+puppet (0.23.2-2) unstable; urgency=low
+
+  * Move the SSL state directory to a more policy-friendly location,
+    /var/lib/puppet/ssl.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Tue, 21 Aug 2007 12:54:40 +1000
+
+puppet (0.23.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Tue,  7 Aug 2007 12:47:49 +1000
+
+puppet (0.23.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch primary maintainer to me.  Thanks jaq.
+  * Make the recommendation for rails >= 1.2.3-2, to avoid
+    incompatibilities.  This breaks compatibility with stable, but the rails
+    package from unstable should install cleanly in stable.  Closes: #433999
+
+ -- Matthew Palmer <mpalmer@debian.org>  Sat, 21 Jul 2007 16:34:36 +1000
+
+puppet (0.23.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Includes a new configuration file handling system; see NEWS.Debian.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Mon, 25 Jun 2007 09:55:12 +1000
+
+puppet (0.22.4-2) unstable; urgency=low
+
+  * Depend on libshadow-ruby1.8, for new password modification functionality
+    added to upstream 0.22.4.
+  * Several improvements from Micah Anderson:
+    - Better vim syntax installation process.
+    - Install Emacs syntax highlighting.
+    - Install logcheck rules.  Closes: #421851.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Thu,  3 May 2007 15:04:15 +1000
+
+puppet (0.22.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Wed,  2 May 2007 12:20:15 +1000
+
+puppet (0.22.3-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #415773.
+  * Switch to using our own logrotate config, and enhance it as per
+    David Schmitt's suggestions.  Closes: #414282.
+  * Add puppetrun to the puppetmaster package, and actually put puppetdoc
+    into the puppet package.  Closes: #419273.
+  * Copy vim syntax highlighting file into the puppet package, and add a
+    stanza to have Vim automatically highlight .pp files.  Closes: #412868.
+    Thanks to David Schmitt for researching how to do all of that.
+  * Add a templatedir setting to the default puppetmasterd.conf to make it
+    obvious that it can be changed.  Closes: #407506.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Wed, 18 Apr 2007 14:03:33 +1000
+
+puppet (0.22.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Fri,  2 Feb 2007 09:06:46 +1100
+
+puppet (0.22.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use --startas instead of --init in init scripts, which (according to
+    Paul Hampson) makes checking for already-running instances work.
+    Closes: #405912.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Mon,  8 Jan 2007 08:41:35 +1100
+
+puppet (0.20.1-1) unstable; urgency=low
+
+  * New upstream release.  (Closes: #387674)
+  * Rationalise the puppetmasterd init script.
+  * Add inclusion of /etc/default files for init scripts.  (Closes: #388178)
+  * Add puppet.conf to match puppetd.conf.  (Closes: #385646)
+
+ -- Matthew Palmer <mpalmer@debian.org>  Thu, 30 Nov 2006 10:54:19 +1100
+
+puppet (0.18.4-1) unstable; urgency=low
+
+  * New upstream release.
+    - Properly detect all services, including those in rcS.d.
+      (Closes: #378351)
+  * Add Homepage: to the long description.  (Closes: #377896)
+  
+ -- Matthew Palmer <mpalmer@debian.org>  Mon, 24 Jul 2006 19:46:06 +1000
+
+puppet (0.18.3-1) unstable; urgency=low
+
+  * New upstream version.
+    - Set DEBIAN_FRONTEND=noninteractive when installing Debian packages.
+      (Closes: #378338)
+
+ -- Matthew Palmer <mpalmer@debian.org>  Sun, 16 Jul 2006 10:58:50 +1000
+
+puppet (0.18.1-1) unstable; urgency=low
+
+  * Make Puppet not wait for a cert at all (to prevent startup hangs).
+  * Cleanup the init scripts to not have NO_START detritus.
+  * Apply puppet.debian-frontend, to set DEBIAN_FRONTEND=noninteractive on
+    package installation.
+
+ -- Matthew Palmer <mpalmer@debian.org>  Tue, 27 Jun 2006 15:05:32 +1000
+
+puppet (0.18.0-1) unstable; urgency=low
+
+  * Initial release.  (Closes: #348625)
+
+ -- Matthew Palmer <mpalmer@debian.org>  Wed, 24 May 2006 13:10:01 +1000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..b8626c4cf
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..9ce75ef23
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,45 @@
+Source: puppet
+Section: admin
+Priority: optional
+Maintainer: Matthew Palmer <mpalmer@debian.org>
+Uploaders: Jamie Wilkinson <jaq@debian.org>, Matthew Palmer <mpalmer@debian.org>
+Build-Depends-Indep: debhelper (>= 4.0.0), ruby (>= 1.8.1)
+Standards-Version: 3.6.2
+
+Package: puppet
+Architecture: all
+Depends: ruby (>= 1.8.1), libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser, facter, lsb-base
+Recommends: rdoc
+Description: centralised configuration management for networks
+ Puppet lets you centrally manage every important aspect of your system
+ using a cross-platform specification language that manages all the
+ separate elements normally aggregated in different files, like users,
+ cron jobs, and hosts, along with obviously discrete elements like
+ packages, services, and files.
+ .
+ Puppet's simple declarative specification language provides powerful
+ classing abilities for drawing out the similarities between hosts while
+ allowing them to be as specific as necessary, and it handles dependency
+ and prerequisite relationships between objects clearly and explicitly.
+ .
+ Homepage: http://reductivelabs.com/projects/puppet
+
+Package: puppetmaster
+Architecture: all
+Depends: ruby (>= 1.8.1), puppet (= ${Source-Version}), facter, lsb-base
+Recommends: rails (>= 1.2.3-2), rdoc
+Description: centralised configuration manangement control daemon
+ Puppet lets you centrally manage every important aspect of your system
+ using a cross-platform specification language that manages all the
+ separate elements normally aggregated in different files, like users,
+ cron jobs, and hosts, along with obviously discrete elements like
+ packages, services, and files.
+ .
+ Puppet's simple declarative specification language provides powerful
+ classing abilities for drawing out the similarities between hosts while
+ allowing them to be as specific as necessary, and it handles dependency
+ and prerequisite relationships between objects clearly and explicitly.
+ .
+ This package contains the manifest server, 'puppetmaster'.
+ .
+ Homepage: http://reductivelabs.com/projects/puppet
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..06bdcab30
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,17 @@
+This package was debianized by Jamie Wilkinson <jaq@debian.org> on
+Thu, 27 Apr 2006 10:18:04 +1000.
+
+It was downloaded from http://reductivelabs.com/downloads/puppet
+
+Copyright Holder: Luke Kanies <luke@madstop.com>
+
+License:
+
+From
+http://reductivelabs.com/documents/faq#what-license-is-puppet-released-under:
+
+Puppet is open source and is released under the GNU Public License.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/fileserver.conf b/debian/fileserver.conf
new file mode 100644
index 000000000..04a51c080
--- /dev/null
+++ b/debian/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 /etc/puppet/files
+#  allow *.example.com
+#  deny *.evil.example.com
+#  allow 192.168.0.0/24
diff --git a/debian/puppet.NEWS b/debian/puppet.NEWS
new file mode 100644
index 000000000..d09cf5da9
--- /dev/null
+++ b/debian/puppet.NEWS
@@ -0,0 +1,21 @@
+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://reductivelabs.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
diff --git a/debian/puppet.conf b/debian/puppet.conf
new file mode 100644
index 000000000..ea60968e9
--- /dev/null
+++ b/debian/puppet.conf
@@ -0,0 +1,8 @@
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+rundir=/var/run
+ssldir=/var/lib/puppet/ssl
+
+[puppetmasterd]
+templatedir=/var/lib/puppet/templates
diff --git a/debian/puppet.dirs b/debian/puppet.dirs
new file mode 100644
index 000000000..faeb94deb
--- /dev/null
+++ b/debian/puppet.dirs
@@ -0,0 +1,7 @@
+usr/sbin
+usr/lib/ruby/1.8
+var/log/puppet
+var/run
+etc/puppet/files
+usr/share/vim/addons/ftdetect
+usr/share/vim/vim70/syntax
diff --git a/debian/puppet.files b/debian/puppet.files
new file mode 100644
index 000000000..e66044524
--- /dev/null
+++ b/debian/puppet.files
@@ -0,0 +1,7 @@
+usr/bin/puppet
+usr/bin/puppetdoc
+usr/sbin/puppetd
+usr/lib/ruby/1.8/
+var/run
+var/log/puppet
+etc/puppet/puppet.conf
diff --git a/debian/puppet.init b/debian/puppet.init
new file mode 100644
index 000000000..e577de643
--- /dev/null
+++ b/debian/puppet.init
@@ -0,0 +1,48 @@
+#! /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
+
+start_puppet() {
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--startas $DAEMON -- $DAEMON_OPTS
+}
+
+stop_puppet() {
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid
+}
+
+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
+	;;
+  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}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/debian/puppet.logrotate b/debian/puppet.logrotate
new file mode 100644
index 000000000..3864e396d
--- /dev/null
+++ b/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
+}
diff --git a/debian/puppet.postinst b/debian/puppet.postinst
new file mode 100644
index 000000000..ac765ba85
--- /dev/null
+++ b/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#
diff --git a/debian/puppet.postrm b/debian/puppet.postrm
new file mode 100644
index 000000000..da994c3c3
--- /dev/null
+++ b/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
diff --git a/debian/puppet.preinst b/debian/puppet.preinst
new file mode 100644
index 000000000..93c1662d8
--- /dev/null
+++ b/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 manangement daemon" \
+	    puppet > /dev/null
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/puppetmaster.files b/debian/puppetmaster.files
new file mode 100644
index 000000000..15bc694b1
--- /dev/null
+++ b/debian/puppetmaster.files
@@ -0,0 +1,4 @@
+usr/sbin/puppetmasterd
+usr/sbin/puppetca
+usr/sbin/puppetrun
+etc/puppet/
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
new file mode 100644
index 000000000..f70704840
--- /dev/null
+++ b/debian/puppetmaster.init
@@ -0,0 +1,51 @@
+#! /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
+
+start_puppetmaster() {
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--startas $DAEMON -- $DAEMON_OPTS
+}
+
+stop_puppetmaster() {
+	start-stop-daemon --stop --quiet --pidfile /var/run/$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
diff --git a/debian/rules b/debian/rules
new file mode 100644
index 000000000..69bf3a4af
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,114 @@
+#!/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/puppet.vim				\
+		$(CURDIR)/debian/puppet/usr/share/vim/vim70/syntax/puppet.vim
+	$(INSTALL) -m0644 ext/vim/filetype.vim				\
+		$(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/puppet.vim
+
+	# 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 -i
+	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
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..29d439f6d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://reductivelabs.com/downloads/puppet/puppet-([0-9]+\..*)\.tgz