--- puppet-0.24.8.orig/lib/puppet/defaults.rb +++ puppet-0.24.8/lib/puppet/defaults.rb @@ -56,6 +56,8 @@ choose one of those; you cannot just make one up."], :statedir => { :default => "$vardir/state", :mode => 01755, + :owner => "$user", + :group => "$group", :desc => "The directory where Puppet state is stored. Generally, this directory can be removed without causing harm (although it might result in spurious service restarts)." @@ -667,7 +669,7 @@ # This doesn't actually work right now. setdefaults(:parser, :lexical => [false, "Whether to use lexical scoping (vs. dynamic)."], - :templatedir => ["$vardir/templates", + :templatedir => ["$confdir/templates", "Where Puppet looks for template files. Can be a list of colon-seperated directories." ] --- puppet-0.24.8.orig/lib/puppet/parser/functions/versioncmp.rb +++ puppet-0.24.8/lib/puppet/parser/functions/versioncmp.rb @@ -1,6 +1,6 @@ require 'puppet/util/package' -Puppet::Parser::Functions::newfunction(:versioncmp, :doc => "Compares two versions.") do |args| +Puppet::Parser::Functions::newfunction(:versioncmp, :type => :rvalue, :doc => "Compares two versions.") do |args| unless args.length == 2 raise Puppet::ParseError, "versioncmp should have 2 arguments" --- puppet-0.24.8.orig/man/man8/puppet.conf.8 +++ puppet-0.24.8/man/man8/puppet.conf.8 @@ -980,7 +980,7 @@ .SS ldapnodes -Whether to search for node configurations in LDAP. See http://reductivelabs.com/puppet/trac/wiki/LdapNodes/ for more information. +Whether to search for node configurations in LDAP. See http://reductivelabs.com/trac/puppet/wiki/LDAPNodes for more information. .TP 2 --- puppet-0.24.8.orig/debian/puppetmaster.dirs +++ puppet-0.24.8/debian/puppetmaster.dirs @@ -0,0 +1 @@ +etc/puppet/manifests --- puppet-0.24.8.orig/debian/puppetmaster.default +++ puppet-0.24.8/debian/puppetmaster.default @@ -0,0 +1,36 @@ +# Defaults for puppetmaster - sourced by /etc/init.d/puppetmaster + +# Start puppet on boot? +START=yes + +# Startup options +DAEMON_OPTS="" + +# What server type to run +# Options: +# webrick (default, cannot handle more than ~30 nodes) +# mongrel (scales better than webrick because you can run +# multiple processes if you are getting +# connection-reset or End-of-file errors, switch to +# mongrel. Requires front-end web-proxy such as +# apache, nginx, or pound) +# See: http://reductivelabs.com/trac/puppet/wiki/UsingMongrel +SERVERTYPE=webrick + +# How many puppetmaster instances to start? Its pointless to set this +# higher than 1 if you are not using mongrel. +PUPPETMASTERS=1 + +# What port should the puppetmaster listen on (default: 8140). If +# PUPPETMASTERS is set to a number greater than 1, then the port for +# the first puppetmaster will be set to the port listed below, and +# further instances will be incremented by one +# +# NOTE: if you are using mongrel, then you will need to have a +# front-end web-proxy (such as apache, nginx, pound) that takes +# incoming requests on the port your clients are connecting to +# (default is: 8140), and then passes them off to the mongrel +# processes. In this case it is recommended to run your web-proxy on +# port 8140 and change the below number to something else, such as +# 18140. +PORT=8140 --- puppet-0.24.8.orig/debian/puppetmaster.install +++ puppet-0.24.8/debian/puppetmaster.install @@ -0,0 +1,7 @@ +debian/fileserver.conf etc/puppet +ext/puppetlast usr/bin +# As of puppet 0.25.0 this will no longer be necessary +# as sbindir will be used by install.rb +debian/tmp/usr/bin/puppetmasterd usr/sbin +debian/tmp/usr/bin/puppetca usr/sbin +debian/tmp/usr/bin/puppetrun usr/sbin --- puppet-0.24.8.orig/debian/puppet.install +++ puppet-0.24.8/debian/puppet.install @@ -0,0 +1,7 @@ +debian/puppet.conf etc/puppet +debian/tmp/usr/bin/filebucket usr/bin +debian/tmp/usr/bin/puppet usr/bin +debian/tmp/usr/bin/puppetdoc usr/bin +debian/tmp/usr/bin/puppetd usr/sbin +debian/tmp/usr/bin/ralsh usr/bin +debian/tmp/usr/lib/ruby/1.8/* usr/lib/ruby/1.8 --- puppet-0.24.8.orig/debian/README.source +++ puppet-0.24.8/debian/README.source @@ -0,0 +1,2 @@ +The debian directory is now maintained on Alioth in git. +See http://pkg-puppet.alioth.debian.org/ for more information. --- puppet-0.24.8.orig/debian/puppetmaster.postrm +++ puppet-0.24.8/debian/puppetmaster.postrm @@ -0,0 +1,20 @@ +#!/bin/sh -e + +case "$1" in + purge) + rm -rf /var/log/puppet + rm -f /etc/puppet/puppetmasterd.conf + rm -rf /etc/puppet/ssl + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 --- puppet-0.24.8.orig/debian/TODO.Debian +++ puppet-0.24.8/debian/TODO.Debian @@ -0,0 +1 @@ +* clean up initscripts per http://mail.madstop.com/pipermail/puppet-dev/2006-June/001069.html --- puppet-0.24.8.orig/debian/puppetmaster.init +++ puppet-0.24.8/debian/puppetmaster.init @@ -0,0 +1,102 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: puppetmaster +# Required-Start: $network $named $remote_fs $syslog +# Required-Stop: $network $named $remote_fs $syslog +# 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/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 + mkdir -p /var/run/puppet +fi + +chown puppet:puppet /var/run/puppet + +is_true() { + if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then + return 0 + else + return 1 + fi +} + +start_puppetmaster() { + if is_true "$START" ; then + if [ "$SERVERTYPE" = "mongrel" ] + then + DAEMON_OPTS="$DAEMON_OPTS --servertype=mongrel" + NUMSTART=0 + STARTPORT=$PORT + while [ $NUMSTART -lt $PUPPETMASTERS ]; do + start-stop-daemon --start --quiet --pidfile=/var/run/puppet/$NAME-$STARTPORT.pid \ + --startas $DAEMON -- $DAEMON_OPTS --masterport=$STARTPORT --pidfile=/var/run/puppet/$NAME-$STARTPORT.pid + STARTPORT=$(($STARTPORT + 1)) + NUMSTART=$(($NUMSTART + 1)) + done + else + start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \ + --startas $DAEMON -- $DAEMON_OPTS --masterport=$PORT + fi + else + echo "" + echo "puppetmaster not configured to start, please edit /etc/default/puppetmaster to enable" + fi +} + +stop_puppetmaster() { + if [ "$SERVERTYPE" = "mongrel" ] + then + NUMSTART=0 + STOPPORT=$PORT + while [ $NUMSTART -lt $PUPPETMASTERS ]; do + start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME-$STOPPORT.pid + rm /var/run/puppet/$NAME-$STOPPORT.pid + STOPPORT=$(($STOPPORT + 1)) + NUMSTART=$(($NUMSTART + 1)) + done + else + start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid + fi +} + +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 --- puppet-0.24.8.orig/debian/puppet.default +++ puppet-0.24.8/debian/puppet.default @@ -0,0 +1,7 @@ +# Defaults for puppet - sourced by /etc/init.d/puppet + +# Start puppet on boot? +START=yes + +# Startup options +DAEMON_OPTS="" --- puppet-0.24.8.orig/debian/puppetmaster.manpages +++ puppet-0.24.8/debian/puppetmaster.manpages @@ -0,0 +1,4 @@ +man/man8/puppetmasterd.8 +man/man8/puppetrun.8 +man/man8/puppetca.8 + --- puppet-0.24.8.orig/debian/fileserver.conf +++ puppet-0.24.8/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 --- puppet-0.24.8.orig/debian/puppet.NEWS +++ puppet-0.24.8/debian/puppet.NEWS @@ -0,0 +1,63 @@ +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 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 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://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 Mon, 25 Jun 2007 10:43:53 +1000 --- puppet-0.24.8.orig/debian/puppet.postrm +++ puppet-0.24.8/debian/puppet.postrm @@ -0,0 +1,21 @@ +#!/bin/sh -e + +case "$1" in + purge) + rm -rf /var/lib/puppet + rm -f /etc/puppet/puppetd.conf + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 --- puppet-0.24.8.orig/debian/rules +++ puppet-0.24.8/debian/rules @@ -0,0 +1,102 @@ +#!/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 + + # Note sbindir does nothing right now. Leaving in for future + # puppet versions where it is respected. + $(CURDIR)/install.rb --destdir=debian/tmp --bindir=/usr/bin \ + --sbindir=/usr/sbin --sitelibdir=/usr/lib/ruby/1.8 + + # strip executable bit from all the non-executable files. + find debian/tmp/usr/lib/ruby/1.8 -type f -perm /u+x,g+x,o+x -exec chmod a-x {} \; + # fix the permissions on all of the directories + find debian/tmp/usr/lib/ruby/1.8 -type d -exec chmod 755 {} \; + + # Vim auto-syntax-highlighting stuff + $(INSTALL) -m0644 ext/vim/syntax/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/addons/syntax/ + $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim \ + $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/ + + # Emacs mode + $(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/* + + install -d -m0775 $(pkgconfdir)/templates + + # Logcheck rules. Gee I wish you could specify a file to source + # in dh_installlogcheck. + ln ext/logcheck/puppet debian/puppet.logcheck.ignore.server + dh_installlogcheck + rm debian/puppet.logcheck.ignore.server + +# Build architecture-dependent files here. +binary-arch: build install + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_install -i + dh_installchangelogs -i CHANGELOG + dh_installdocs -i + dh_installman + dh_installinit -ppuppetmaster --no-start + dh_installinit -ppuppet --no-start --error-handler=true -- 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 --- puppet-0.24.8.orig/debian/puppet.init +++ puppet-0.24.8/debian/puppet.init @@ -0,0 +1,85 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: puppet +# Required-Start: $network $named $remote_fs $syslog +# Required-Stop: $network $named $remote_fs $syslog +# Should-Start: puppetmaster +# 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/sbin/puppetd +DAEMON_OPTS="" +NAME=puppetd +DESC="puppet configuration management tool" + +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() { + start-stop-daemon --stop --quiet --signal HUP --pidfile /var/run/puppet/$NAME.pid +} + +start_puppet() { + if is_true "$START" ; then + start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \ + --startas $DAEMON -- $DAEMON_OPTS + else + echo "" + echo "puppet not configured to start, please edit /etc/default/puppet to enable" + fi +} + +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 --- puppet-0.24.8.orig/debian/puppet.logrotate +++ puppet-0.24.8/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 +} --- puppet-0.24.8.orig/debian/docs +++ puppet-0.24.8/debian/docs @@ -0,0 +1 @@ +README --- puppet-0.24.8.orig/debian/puppet.postinst +++ puppet-0.24.8/debian/puppet.postinst @@ -0,0 +1,14 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ]; then + if ! getent passwd puppet > /dev/null; then + adduser --quiet --system --group --home /var/lib/puppet \ + --gecos "Puppet configuration management daemon" \ + puppet + fi + 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# --- puppet-0.24.8.orig/debian/puppet.dirs +++ puppet-0.24.8/debian/puppet.dirs @@ -0,0 +1,7 @@ +usr/sbin +usr/lib/ruby/1.8 +var/log/puppet +etc/puppet/files +usr/share/vim/addons/ftdetect +usr/share/vim/addons/syntax +var/lib/puppet --- puppet-0.24.8.orig/debian/compat +++ puppet-0.24.8/debian/compat @@ -0,0 +1 @@ +5 --- puppet-0.24.8.orig/debian/puppet.manpages +++ puppet-0.24.8/debian/puppet.manpages @@ -0,0 +1,7 @@ +man/man8/puppet.8 +man/man8/filebucket.8 +man/man8/puppet.8 +man/man8/puppet.conf.8 +man/man8/puppetd.8 +man/man8/puppetdoc.8 +man/man8/ralsh.8 --- puppet-0.24.8.orig/debian/control +++ puppet-0.24.8/debian/control @@ -0,0 +1,49 @@ +Source: puppet +Section: admin +Priority: optional +XSBC-Original-Maintainer: Puppet Package Maintainers +Maintainer: Ubuntu MOTU Developers +Uploaders: Thom May , Micah Anderson , Andrew Pollock , Nigel Kersten +Build-Depends-Indep: ruby (>= 1.8.1), libopenssl-ruby, facter +Build-Depends: debhelper (>= 4.0.0), openssl +Standards-Version: 3.8.1 +Vcs-Git: git://git.debian.org/git/pkg-puppet/puppet.git +Vcs-Browser: http://git.debian.org/?p=pkg-puppet/puppet.git +Homepage: http://reductivelabs.com/trac/puppet + +Package: puppet +Architecture: all +Depends: ruby1.8, libxmlrpc-ruby, libopenssl-ruby, libshadow-ruby1.8, adduser, facter, lsb-base +Recommends: rdoc, libaugeas-ruby1.8 +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. + +Package: puppetmaster +Architecture: all +Depends: ruby1.8, puppet (= ${source:Version}), facter, lsb-base +Conflicts: puppet (<< 0.24.7-1) +Recommends: rails (>= 1.2.3-2), rdoc, libldap-ruby1.8 +Suggests: apache2 | nginx, mongrel +Description: centralised configuration management 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'. + --- puppet-0.24.8.orig/debian/changelog +++ puppet-0.24.8/debian/changelog @@ -0,0 +1,511 @@ +puppet (0.24.8-2ubuntu3) karmic; urgency=low + + * Fix typo in build. + + -- Chuck Short Tue, 08 Sep 2009 14:18:00 -0400 + +puppet (0.24.8-2ubuntu2) karmic; urgency=low + + * Fix build. + + -- Chuck Short Fri, 04 Sep 2009 10:54:28 -0400 + +puppet (0.24.8-2ubuntu1) karmic; urgency=low + + * debian/rules: Dont start puppet and puppetmaster when first + installing puppet. + * debian/puppet.conf, lib/puppet/defaults.rb: Move templates to + /etc/puppet + * lib/puppet/defaults.rb: Fix /var/lib/puppet/state ownership. + * man/man8/puppet.conf.8: Fix broken URL in manpage. + * Update maintainer according to spec. + + -- Chuck Short Mon, 17 Aug 2009 13:24:34 -0400 + +puppet (0.24.8-2) unstable; urgency=high + + [ Micah Anderson ] + * Cherry-pick upstream versioncmp fix (redmine:#2110) + + [ Andrew Pollock ] + * Enable waiting for certificates for the default value (upstream default + that was previously disabled or enabled with a 5 second value) + * Re-ship the vim syntax file in the correct location (it fell out after the + 0.24.5-3 upload) (closes: #530752) + * Re-add the 0.24.5-3 changelog entry + * debian/puppet.postrm: don't delete the user or group (closes: #528068, + #527381) + * debian/puppet.{preinst,postinst}: Applied modified patch from Stig + Sandbeck Mathisen to call conditionally call adduser in the postinst, if + it's available + + [ Nigel Kersten ] + * Switched to use install.rb, primarily to stop shebangs using /usr/bin/env + * Stopped using dh_movefiles, moved to dh_install + * debian/rules greatly cleaned up due to above two changes + + [ Andrew Pollock ] + * debian/control: add rdoc, libopenssl-ruby and facter to build dependencies + * debian/control: depend on ruby1.8 instead of ruby to placate Lintian + * debian/puppet.install: brown paper bag release averted; install + /usr/lib/ruby/1.8 + * debian/rules: ensure permissions on everything under /usr/lib/ruby/1.8 is + correct + + -- Andrew Pollock Tue, 16 Jun 2009 23:37:22 -0700 + +puppet (0.24.8-1) unstable; urgency=low + + * New upstream release + * debian/control: Add Nigel Kersten and myself as uploaders + * debian/changelog: wrap long lines + * debian/watch: ignore release candidates + * debian/compat: bump to 5 + * debian/control: bump Standards-Version (no changes) + + -- Andrew Pollock Mon, 13 Apr 2009 17:12:47 -0700 + +puppet (0.24.7-2) experimental; urgency=low + + * make puppetmaster conflict previous puppet due to man page move + + -- Micah Anderson Wed, 28 Jan 2009 10:28:23 -0500 + +puppet (0.24.7-1) experimental; urgency=low + + * New upstream release + * Fixed comment in defaults/puppetmaster (Closes: #510881) + * Fixed debian/puppetmaster.manpages and debian/puppet.manpages to + distribute + puppetrun and puppetca correctly, thanks Savvas Radevic (Closes: #511826) + * Added puppetmaster Recommends: libldap-ruby1.8 to silence puppetrun + (Closes: #512639) + * Added puppet Recommends: libaugeas-ruby1.8 for new Augeas support in this + release + + -- Micah Anderson Fri, 23 Jan 2009 09:27:09 -0500 + +puppet (0.24.6-1) experimental; urgency=low + + * New upstream release (Closes: #506129, #504624, #502163) + * Distribute filebucket binary (Closes: #499999) + * Fix missing check for START variable in defaults files (Closes: #498284) + * Fix maintainer scripts so that they do not ignore errors (set -e) + * Fix maintainer scripts so they don't have prepended paths (thanks lintian) + * Cherry-pick fixes from upstream: + - comparison of String with 0 failed (Closes: #500848) + - filename cannot handle ++ (Closes: #502163) + - tidy must specify size, age or both (Closes: #500852) + + -- Micah Anderson Sat, 29 Nov 2008 13:59:25 -0500 + +puppet (0.24.5-3) unstable; urgency=medium + + * Set wait for cert timeout to 5 secs, to avoid resource abuse (Closes: + #509566) + * Distribute filebucket binary (Closes: #499999) + * Place vim syntax in the correct location (LP: #181960) + + -- Thom May Wed, 07 Jan 2009 15:15:34 -0500 + +puppet (0.24.5-2) unstable; urgency=low + + * Fix puppetlast to work with 0.24.5 + * Adjust logcheck to match against new log messages in 0.24.5 + * Update standards version to 3.8.0 (no changes) + * Update changelog to reduce length of line to make lintian happy + + -- Micah Anderson Sat, 26 Jul 2008 15:43:45 -0400 + +puppet (0.24.5-1) unstable; urgency=low + + * New upstream release + * Applied patch from Martin Krafft to improve logcheck file installation + + -- Thom May Thu, 24 Jul 2008 10:58:08 +0100 + +puppet (0.24.4-8) unstable; urgency=low + + * Changed the default port value to 8140 in /etc/default/puppetmaster + to be consistent with the client default port. (Closes: #483823) + * Cherry-picked various bug fixes from upstream: + - further emacs mode updates from Russ Allbery + - misleading error if CA private key can not be decrypted (trac:#1271) + - fix missing bracket in documentation (trac:#1209) + - man pages updates (trac:#1211) + - add dump parameter to mount type (trac:#1212) + - fixed undefined variable in lib/puppet/util/settings.rb (trac:#1218) + - usermod problem on Solaris (trac:#1207) + - added native authorized_keys type + - test within a template if a variable or fact is defined (trac:#1177) + - Fixed Red Hat service disabling (trac:#1219) + - fix crontab provider parse error when line begins w/space (trac:#1216) + - Fix for latest method in rpm provider (trac:#1224) + - puppetd documentation updates (trac:#1227) + - Modified the 'factpath' setting to automatically configure Facter + to load facts there if a new enough version of Facter is used. + - Removing unused file lib/puppet/util/variables.rb (trac:#1229) + - Fixing transaction support for prefetching generated resources. + Previously, we prefetched then generated, which caused generated + resources that needed prefetching not to work. This just reorders + the calls, so generated resources now get prefetched. + - Respect "replace => false" for symlinks (trac:#1235) + - Added cron random function fixing ticket (trac:#311) + - No more clear_cache failures (trac:#1247) + - Fixed Rakefile to install non-.rb files (trac:#1266) + + -- Micah Anderson Sat, 31 May 2008 11:39:47 -0400 + +puppet (0.24.4-7) unstable; urgency=low + + * Update emacs-mode with changes cherry-picked from rra's repository + * Fix typo in puppetmaster.init (Closes: #480019) + * Fix variable name in /etc/default/puppetmaster comments + * Fix incorrect port increment in puppetmaster initscript when mongrel + is used, thanks Francois Deppierraz (Closes: #480263) + * Add puppetmaster.postrm to remove /var/log/puppet on purge + * Added debian/puppetmaster.dirs containing etc/puppet/manifests + * Remove puppet group on purge (Closes: #481511) + * Remove old config files and stray directories (Closes: #454681) + + -- Micah Anderson > Sat, 03 May 2008 16:18:32 -0400 + +puppet (0.24.4-6) unstable; urgency=low + + * Remove bashisms in puppetmaster.init + * Add puppetlast script + + -- Micah Anderson > Wed, 30 Apr 2008 07:37:04 -0400 + +puppet (0.24.4-5) unstable; urgency=low + + * Fix missing --pidfile piece for mongrel startup and make + stop consistent, thanks Bart Cortooms (Closes: #476840) + * Add trailing newline missing from default files + + -- Micah Anderson Sat, 19 Apr 2008 11:03:35 -0400 + +puppet (0.24.4-4) unstable; urgency=low + + * Create /etc/default/puppet and /etc/default/puppetmaster + * Modify /etc/init.d/puppetmaster to support mongrel instances + on multiple ports + * Remove no longer necessary .svn cleaning from debian/rules + * Added $network and $named appropriated places in the LSB + headers in puppet and puppetmaster initscripts, + thanks Sam Quigley + * Install ralsh (Closes: #476629) + * Cherry-pick upstream patches from 0.24.x branch: + - Install manpages + - Fix shebang issues (#1148) + - Updated fix for (#1020) + - Fix for (#1174) + - Emacs mode updates (#1160) + - Debian service [en|dis]able issue (#1161) + - User type group list validation enhancement + - Fix configtimeout issue (#1176) + + -- Micah Anderson Sun, 13 Apr 2008 19:18:46 -0400 + +puppet (0.24.4-3) unstable; urgency=low + + * Remove pi binary, puppetdoc provides this functionality now + (Closes: #472850) + + -- Micah Anderson Fri, 28 Mar 2008 12:38:30 -0400 + +puppet (0.24.4-2) unstable; urgency=low + + * Fix duplicate man8/puppetmasterd.8 install + + -- Micah Anderson Tue, 25 Mar 2008 22:58:22 -0400 + +puppet (0.24.4-1) unstable; urgency=low + + * New upstream release + * Install man pages missing from upstream release + + -- Micah Anderson Tue, 25 Mar 2008 18:17:02 -0400 + +puppet (0.24.3-1) unstable; urgency=low + + [ Micah Anderson] + * New upstream release + * Install man pages (Closes: #385529) + * Apply lsb formatted dependency info into initscripts, thanks + Petter Reinholdtsen (Closes: #462915) + * Install more robust puppet-mode.el + * Add factpath and pluginsync=true to the default puppet.conf so that + facts added through pluginsync are loaded by puppet + * Add [plugins] section to fileserver.conf + * Updated outdated debian/control substrvar for puppet to ${source:Version} + * Updated link in debian/copyright for new URL to license + * Updated copyright in debian/copyright + * Bumped standards version to 3.7.3.0 (no changes) + * Switch debhelper from Build-Depends-Indep to Build-Depends because it is + required to run clean target (lintian check: + clean-should-be-satisfied-by-build-depends) + * Moved homepage from Description to control field + * Added Vcs-Browser and Vcs-Git fields to debian/control + [ Thom May ] + * If puppet can't start, continue with package install + + -- Micah Anderson Sun, 09 Mar 2008 14:03:00 -0400 + +puppet (0.24.1-2) unstable; urgency=low + + * Set rundir correctly (Closes: #460203, #459579) + * Apply patch for puppet#1003 to enable collection of tagged resources + + -- Thom May Wed, 16 Jan 2008 11:08:55 +0100 + +puppet (0.24.1-1) unstable; urgency=low + + * New upstream release (Closes: #445626) + * Set maintainer to pkg-puppet-devel + + -- Thom May Sun, 30 Dec 2007 19:13:47 +0100 + +puppet (0.24.0-1) unstable; urgency=low + + * New upstream release + + -- Thom May Wed, 19 Dec 2007 16:00:34 +0100 + +puppet (0.23.2-15) unstable; urgency=low + + * No change upload setting maintainer to me whilst waiting for an alioth + project. + + -- Thom May Thu, 29 Nov 2007 10:44:50 +0100 + +puppet (0.23.2-14) unstable; urgency=low + + * Orphaning. + * Create /var/lib/puppet in the puppet package. Closes: #452506. + * Start the puppet init script after puppetmaster, to silence whiny bug + reports. Closes: #452064. + * Add a reload command to the Puppet init script. Closes: #452060. + + -- Matthew Palmer Thu, 29 Nov 2007 10:48:21 +1100 + +puppet (0.23.2-13) unstable; urgency=low + + * Drop quotes from an already-quoted value in a query. Closes: #448179. + * Remove excessive quoting from puppet/network/handler/master.rb. + Closes: #448221. + * Force removal of directories during pluginsync. Closes: #448180. + + -- Matthew Palmer Tue, 30 Oct 2007 14:55:19 +1100 + +puppet (0.23.2-12) unstable; urgency=low + + * Create /var/run/puppet and set the perms in the various initscripts, as + well as hardcoding the rundir better in configuration.rb and removing + the explicit rundir setting from puppet.conf. Closes: #447314. + * Apply additional patch given (backwards) to fix export/collect on some + database backends. Closes: #445591 (again!) + + -- Matthew Palmer Sat, 20 Oct 2007 11:28:50 +1000 + +puppet (0.23.2-11) unstable; urgency=low + + * Apply patch from puppet#786 to fix a problem with exported resources not + being properly detected as needing a rerun. Closes: #445591. + * Fix ignore handling for the plugins mount. Closes: #446390. + + -- Matthew Palmer Mon, 15 Oct 2007 09:11:25 +1000 + +puppet (0.23.2-10) unstable; urgency=low + + * Recycle connections when we change (or get) certs. + * Catch and retry more transient errors in the XMLRPC wrapper. + + -- Matthew Palmer Thu, 27 Sep 2007 15:06:11 +1000 + +puppet (0.23.2-9) unstable; urgency=low + + * Recycle the HTTP connection if we get an EPIPE during a request. + Closes: #444177. Thanks to Jos Backus for helping with testing. + + -- Matthew Palmer Thu, 27 Sep 2007 09:55:34 +1000 + +puppet (0.23.2-8) unstable; urgency=low + + * Remove extraneous debugging output accidentally left behind in the last + release. + * Fix spelling mistakes in debian/control and debian/puppet.preinst. + Closes: #444158. + + -- Matthew Palmer Thu, 27 Sep 2007 07:45:07 +1000 + +puppet (0.23.2-7) unstable; urgency=low + + * Ignore ENOENT errors in the module plugin syncing code, since they're + innocuous and expected. + * Allow facts that are downloaded through pluginsync to be used like any + other fact. + * Allow users to still have an old-style plugins mount if they want, by + specifying a path for the mount. Also track down a fault in old-style + fileserving which did strange slash-stripping. Closes: #443932. + + -- Matthew Palmer Tue, 25 Sep 2007 16:41:32 +1000 + +puppet (0.23.2-6) unstable; urgency=low + + * Patch rails/param_name.rb to stop query failures, as per puppet#784. + * Actually honour namevar. + * Only set dbuser if explicitly asked for. + * Fix annoying database deletion error for ParamValue objects. + * Add an accessor for ca_file, since older openssl-ruby only had a writer. + * Fix the fileserver to honour ignore. Thanks to Nathan Ward for the + bug report on IRC. + + -- Matthew Palmer Thu, 20 Sep 2007 16:10:41 +1000 + +puppet (0.23.2-5) unstable; urgency=low + + * Add some NEWS for the ssldir transition. Should have done that earlier. + * Remove the explicit mode change for vardir, and fix up the mode on + statedir, as well. Closes: #425496. + * Only set some database parameters if they're explicitly set; this makes + life easier for PgSQL ident auth. + * Allow empty config options. + + -- Matthew Palmer Thu, 13 Sep 2007 11:09:59 +1000 + +puppet (0.23.2-4) unstable; urgency=low + + * Fix puppet#776 in a slightly better way by only flushing the cache when + a value is changed, rather than whenever a value is read. + * Apply patch from puppet#755 to cache connections to the Puppetmaster, + which improves performance by more than a little. + * Modify the fileserver so that it provides a 'plugins' mount which + exports the union of the plugins directory of all modules. + + -- Matthew Palmer Fri, 31 Aug 2007 15:32:04 +1000 + +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 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 Tue, 21 Aug 2007 12:54:40 +1000 + +puppet (0.23.2-1) unstable; urgency=low + + * New upstream release. + + -- Matthew Palmer 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 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 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 Thu, 3 May 2007 15:04:15 +1000 + +puppet (0.22.4-1) unstable; urgency=low + + * New upstream release. + + -- Matthew Palmer 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 Wed, 18 Apr 2007 14:03:33 +1000 + +puppet (0.22.1-1) unstable; urgency=low + + * New upstream release. + + -- Matthew Palmer 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 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 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 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 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 Tue, 27 Jun 2006 15:05:32 +1000 + +puppet (0.18.0-1) unstable; urgency=low + + * Initial release. (Closes: #348625) + + -- Matthew Palmer Wed, 24 May 2006 13:10:01 +1000 --- puppet-0.24.8.orig/debian/puppet.conf +++ puppet-0.24.8/debian/puppet.conf @@ -0,0 +1,10 @@ +[main] +logdir=/var/log/puppet +vardir=/var/lib/puppet +ssldir=/var/lib/puppet/ssl +rundir=/var/run/puppet +factpath=$vardir/lib/facter +pluginsync=true + +[puppetmasterd] +templatedir=/var/lib/puppet/templates --- puppet-0.24.8.orig/debian/copyright +++ puppet-0.24.8/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Jamie Wilkinson on +Thu, 27 Apr 2006 10:18:04 +1000. + +It was downloaded from http://reductivelabs.com/downloads/puppet + +Puppet - Automating Configuration Management. +Copyright (C) 2005 Reductive Labs LLC + +License: + +From: +http://reductivelabs.com/trac/puppet/wiki/FrequentlyAskedQuestions#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'. + --- puppet-0.24.8.orig/debian/watch +++ puppet-0.24.8/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://reductivelabs.com/downloads/puppet/puppet-([0-9]+\.[0-9]+\.[0-9]+)\.tgz