Package: puppet
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch
I've attached an updated version of the patch against the latest
revision in the git repository.
-- System Information:
Debian Release: squeeze/sid
APT prefers lucid-updates
APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-22-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.utf8, LC_CTYPE=en_CA.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages puppet depends on:
ii adduser 3.112ubuntu1 add and remove users and groups
ii facter 1.5.6-2ubuntu2 a library for retrieving facts fro
ii libopenssl-ruby 4.2 OpenSSL interface for Ruby
ii libruby [libxmlrpc-ruby] 4.2 Libraries necessary to run Ruby 1.
ii libshadow-ruby1.8 1.4.1-8build1 Interface of shadow password for R
ii libxmlrpc-ruby 4.2 transitional dummy package
ii lsb-base 4.0-0ubuntu8 Linux Standard Base 4.0 init scrip
ii puppet-common 0.25.4-2ubuntu6 common files for puppet and puppet
ii ruby1.8 1.8.7.249-2 Interpreter of object-oriented scr
Versions of packages puppet recommends:
ii libaugeas-ruby1.8 0.2.0-2ubuntu3 Augeas bindings for the Ruby langu
ii rdoc 4.2 Generate documentation from ruby s
Versions of packages puppet suggests:
ii etckeeper 0.41ubuntu3 store /etc in git, mercurial, bzr
pn puppet-el <none> (no description available)
ii vim-puppet 0.25.4-2ubuntu6 Vim syntax highlighting for puppet
-- no debconf information
=== added file 'debian/README.Debian'
--- debian/README.Debian 1970-01-01 00:00:00 +0000
+++ debian/README.Debian 2010-06-03 19:37:03 +0000
@@ -0,0 +1,8 @@
+puppet for Debian
+------------------
+
+The default puppet configuration in Debian will automatically integrate with
+etckeeper if etckeeper is installed. puppet will automatically commit any
+changes made to files in /etc via etckeeper before and after its run.
+
+ -- Mathias Gug <math...@ubuntu.com> Thu, 25 Feb 2010 12:12:37 -0500
=== modified file 'debian/control'
--- debian/control 2010-04-25 22:16:41 +0000
+++ debian/control 2010-06-03 19:37:42 +0000
@@ -14,7 +14,7 @@
Architecture: all
Depends: ${misc:Depends}, ruby1.8, libxmlrpc-ruby, libopenssl-ruby,
libshadow-ruby1.8, adduser, facter, lsb-base, puppet-common (=
${source:Version})
Recommends: rdoc, libaugeas-ruby1.8
-Suggests: puppet-el, vim-puppet, libselinux-ruby1.8
+Suggests: puppet-el, vim-puppet, libselinux-ruby1.8, etckeeper
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
=== added file 'debian/etckeeper-commit-post'
--- debian/etckeeper-commit-post 1970-01-01 00:00:00 +0000
+++ debian/etckeeper-commit-post 2010-06-03 19:37:03 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+which etckeeper > /dev/null 2>&1 || exit 0
+
+etckeeper commit "committing changes in /etc after puppet catalog run"
+
+# Failure of etckeeper should not be fatal.
+# For example if there aren't any changes to be commited etckeeper returns
+# a non-zero status for now.
+exit 0
=== added file 'debian/etckeeper-commit-pre'
--- debian/etckeeper-commit-pre 1970-01-01 00:00:00 +0000
+++ debian/etckeeper-commit-pre 2010-06-03 19:37:03 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+which etckeeper > /dev/null 2>&1 || exit 0
+
+etckeeper commit "saving uncommitted changes in /etc prior to puppet catalog
run"
+
+# Failure of etckeeper should not be fatal.
+# For example if there aren't any changes to be commited etckeeper returns
+# a non-zero status for now.
+exit 0
=== modified file 'debian/puppet.conf'
--- debian/puppet.conf 2010-03-15 22:05:43 +0000
+++ debian/puppet.conf 2010-06-03 19:37:03 +0000
@@ -5,3 +5,5 @@
rundir=/var/run/puppet
factpath=$vardir/lib/facter
templatedir=$confdir/templates
+prerun_command=/etc/puppet/etckeeper-commit-pre
+postrun_command=/etc/puppet/etckeeper-commit-post
=== modified file 'debian/rules'
--- debian/rules 2010-04-16 04:20:43 +0000
+++ debian/rules 2010-06-03 19:37:03 +0000
@@ -77,6 +77,12 @@
$(INSTALL) -m0644 ext/rack/files/config.ru \
$(CURDIR)/debian/puppetmaster/usr/share/puppet/rack/puppetmasterd
+ # etckeeper integration
+ $(INSTALL) -m0755 debian/etckeeper-commit-pre \
+ $(CURDIR)/debian/puppet/etc/puppet/etckeeper-commit-pre
+ $(INSTALL) -m0755 debian/etckeeper-commit-post \
+ $(CURDIR)/debian/puppet/etc/puppet/etckeeper-commit-post
+
dh_installexamples examples/*
# Logcheck rules. Gee I wish you could specify a file to source
