Merge lp:~soren/ubuntu/lucid/puppet/etckeeper-integration into lp:ubuntu/lucid/puppet

[Mathias Gug]

[Mathias Gug (mathiaz)]

Accepted. Included in 0.25.4-2ubuntu2.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-12 17:31:26 +0000
+++ debian/changelog	2010-02-17 15:05:25 +0000
@@ -1,3 +1,17 @@
+puppet (0.25.4-1ubuntu2) UNRELEASED; urgency=low
+
+  * etckeeper integration (server-lucid-puppet-etckeeper-integration):
+    - debian/etckeeper-commit-post, debian/etckeeper-commit-pre:
+      + Call "etckeeper commit" before and after catalog runs.
+        Silently bail out if etckeeper is not available.
+    - debian/puppet.conf:
+      + Call out to the etckeeper hooks using the new prerun_command,
+        and postrun_command hooks.
+    - debian/rules:
+      + Install the etckeeper hook scripts in /etc/puppet.
+
+ -- Soren Hansen <[e-mail]>  Mon, 15 Feb 2010 21:24:54 +0100
+
 puppet (0.25.4-1ubuntu1) lucid; urgency=low
 
   * Merge from debian testing.  Remaining changes:
 
=== added file 'debian/etckeeper-commit-post'
--- debian/etckeeper-commit-post	1970-01-01 00:00:00 +0000
+++ debian/etckeeper-commit-post	2010-02-17 15:05:25 +0000
@@ -0,0 +1,10 @@
+#!/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.
+exit 0
 
=== added file 'debian/etckeeper-commit-pre'
--- debian/etckeeper-commit-pre	1970-01-01 00:00:00 +0000
+++ debian/etckeeper-commit-pre	2010-02-17 15:05:25 +0000
@@ -0,0 +1,10 @@
+#!/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.
+exit 0
 
=== modified file 'debian/puppet.conf'
--- debian/puppet.conf	2008-03-28 12:38:30 +0000
+++ debian/puppet.conf	2010-02-17 15:05:25 +0000
@@ -5,6 +5,8 @@
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 pluginsync=true
+prerun_command=/etc/puppet/etckeeper-commit-pre
+postrun_command=/etc/puppet/etckeeper-commit-post
 
 [puppetmasterd]
 templatedir=/var/lib/puppet/templates
 
=== modified file 'debian/rules'
--- debian/rules	2010-02-12 17:31:26 +0000
+++ debian/rules	2010-02-17 15:05:25 +0000
@@ -66,6 +66,12 @@
 	$(INSTALL) -m0644 ext/emacs/puppet-mode.el			\
 		$(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
 
+	# 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/*
 
 	install -d -m0775 $(pkgconfdir)/templates