Ubuntu
puppet package

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

  1. Lucid (10.04)
  2. etckeeper-integration
  3. Merge into lucid
Proposed by Mathias Gug
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp:~soren/ubuntu/lucid/puppet/etckeeper-integration
Merge into: lp:ubuntu/lucid/puppet
Diff against target: 81 lines (+42/-0)
5 files modified
debian/changelog (+14/-0)
debian/etckeeper-commit-post (+10/-0)
debian/etckeeper-commit-pre (+10/-0)
debian/puppet.conf (+2/-0)
debian/rules (+6/-0)
To merge this branch: bzr merge lp:~soren/ubuntu/lucid/puppet/etckeeper-integration
Reviewer Review Type Date Requested Status
Mathias Gug Approve
Review via email: mp+19492@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathias Gug (mathiaz) wrote :

Accepted. Included in 0.25.4-2ubuntu2.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-12 17:31:26 +0000
3+++ debian/changelog 2010-02-17 15:05:25 +0000
4@@ -1,3 +1,17 @@
5+puppet (0.25.4-1ubuntu2) UNRELEASED; urgency=low
6+
7+ * etckeeper integration (server-lucid-puppet-etckeeper-integration):
8+ - debian/etckeeper-commit-post, debian/etckeeper-commit-pre:
9+ + Call "etckeeper commit" before and after catalog runs.
10+ Silently bail out if etckeeper is not available.
11+ - debian/puppet.conf:
12+ + Call out to the etckeeper hooks using the new prerun_command,
13+ and postrun_command hooks.
14+ - debian/rules:
15+ + Install the etckeeper hook scripts in /etc/puppet.
16+
17+ -- Soren Hansen <soren@ubuntu.com> Mon, 15 Feb 2010 21:24:54 +0100
18+
19 puppet (0.25.4-1ubuntu1) lucid; urgency=low
20
21 * Merge from debian testing. Remaining changes:
22
23=== added file 'debian/etckeeper-commit-post'
24--- debian/etckeeper-commit-post 1970-01-01 00:00:00 +0000
25+++ debian/etckeeper-commit-post 2010-02-17 15:05:25 +0000
26@@ -0,0 +1,10 @@
27+#!/bin/sh
28+
29+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
30+
31+which etckeeper > /dev/null 2>&1 || exit 0
32+
33+etckeeper commit "committing changes in /etc after puppet catalog run"
34+
35+# Failure of etckeeper should not be fatal.
36+exit 0
37
38=== added file 'debian/etckeeper-commit-pre'
39--- debian/etckeeper-commit-pre 1970-01-01 00:00:00 +0000
40+++ debian/etckeeper-commit-pre 2010-02-17 15:05:25 +0000
41@@ -0,0 +1,10 @@
42+#!/bin/sh
43+
44+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
45+
46+which etckeeper > /dev/null 2>&1 || exit 0
47+
48+etckeeper commit "saving uncommitted changes in /etc prior to puppet catalog run"
49+
50+# Failure of etckeeper should not be fatal.
51+exit 0
52
53=== modified file 'debian/puppet.conf'
54--- debian/puppet.conf 2008-03-28 12:38:30 +0000
55+++ debian/puppet.conf 2010-02-17 15:05:25 +0000
56@@ -5,6 +5,8 @@
57 rundir=/var/run/puppet
58 factpath=$vardir/lib/facter
59 pluginsync=true
60+prerun_command=/etc/puppet/etckeeper-commit-pre
61+postrun_command=/etc/puppet/etckeeper-commit-post
62
63 [puppetmasterd]
64 templatedir=/var/lib/puppet/templates
65
66=== modified file 'debian/rules'
67--- debian/rules 2010-02-12 17:31:26 +0000
68+++ debian/rules 2010-02-17 15:05:25 +0000
69@@ -66,6 +66,12 @@
70 $(INSTALL) -m0644 ext/emacs/puppet-mode.el \
71 $(CURDIR)/debian/puppet-el/usr/share/emacs/site-lisp/puppet-mode.el
72
73+ # etckeeper integration
74+ $(INSTALL) -m0755 debian/etckeeper-commit-pre \
75+ $(CURDIR)/debian/puppet/etc/puppet/etckeeper-commit-pre
76+ $(INSTALL) -m0755 debian/etckeeper-commit-post \
77+ $(CURDIR)/debian/puppet/etc/puppet/etckeeper-commit-post
78+
79 dh_installexamples examples/*
80
81 install -d -m0775 $(pkgconfdir)/templates

Subscribers

People subscribed via source and target branches

to all changes: