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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/lucid/puppet

Mathias Gug: Approve on 2010-02-17

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

28. By Soren Hansen on 2010-02-15

* 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.

27. By Soren Hansen on 2010-02-12

* Merge from debian testing. Remaining changes:
  - debian/rules:
    + Don't start puppet 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.
    + Change owner/group to "service". (LP #509625)
  - debian/control:
    + Move puppetmaster's Recommends to Suggests.
    + Created puppet-testsuite as a seperate package.
      Allow the users to run puppet's testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can actually be
    run.

26. By Chuck Short on 2010-01-26

lib/puppet/defaults.rb: Change owner/group to "service".
(LP: #509625)

25. By Chuck Short on 2009-12-23

* Merge from debian testing. Remaining changes:
  - debian/rules:
    + Don't start puppet 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.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

24. By Soren Hansen on 2009-11-27

Fix path reference for the testsuite. (LP: #488708)

23. By Chuck Short on 2009-09-10

* debian/control: puppetmaster Recommends -> Suggests.
* debian/rules: Start puppetmaster when installing puppetmaster.
  (LP: #427466)
* tests/Rakefile: Fix Rakefile so that the testsuite can acutally be ran.
* Created puppet-testsuite as a seperate. Allow the users to run puppet's
  tessuite

22. By Chuck Short on 2009-09-08

Fix typo in build.

21. By Chuck Short on 2009-09-04

Fix build.

20. By Chuck Short on 2009-08-17

* 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.

19. By Andrew Pollock on 2009-06-16

[ 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