lp://staging/~nvalcarcel/ubuntu/lucid/puppet/fix-546677
- Get this branch:
- bzr branch lp://staging/~nvalcarcel/ubuntu/lucid/puppet/fix-546677
Branch merges
Branch information
- Owner:
- Nicolas Valcarcel
- Status:
- Development
Recent revisions
- 31. By Mathias Gug
-
debian/
puppetmaster. init: Fix init stop action to not fail if the
puppetmaster is already stopped. - 30. By Mathias Gug
-
[ Angel Abad ]
* Fix return codes puppetmaster.init and puppet.init (LP: #527860)[ Mathias Gug ]
* debian/puppet- common. postrm: only remove puppet directories if they're
empty on package purge.
* etckeeper integration:
+ debian/README. Debian: add a note about etckeeper integration.
+ debian/control: suggest etckeeper. - 29. By Soren Hansen
-
* 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. - 28. By Mathias Gug
-
* Merge from debian unstable. Remaining changes:
- 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.
* debian/control:
- Add debhelper misc:depends to puppet-testsuite binary package to fix
lintian warning.
* debian/rules, debian/puppet- common. dirs:
- Create templates directory in puppet config directory and include it in
puppet-common directory.
* debian/puppet- common. postrm:
- On purge delete all puppet directories: /etc/puppet, /var/log/puppet and
/var/lib/puppet.
* Dropped:
- debian/rules:
+ Don't start puppet when first installing puppet. puppetd default file
doesn't start puppet by default.
- debian/puppet.conf, lib/puppet/defaults. rb:
+ Move templates to /etc/puppet.
Fixed in Debian.
- lib/puppet/defaults. rb:
+ Fix /var/lib/puppet/ state ownership.
Fixed in Debian.
- lib/puppet/defaults. rb:
+ Change owner/group to "service". (LP #509625)
No longer needed. - 27. By Soren Hansen
-
* 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. - 25. By Chuck Short
-
* 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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/lucid/puppet