lp:~ampelbein/puppet/lp-726856
- Get this branch:
- bzr branch lp:~ampelbein/puppet/lp-726856
Branch merges
- Dave Walker (community): Approve
-
Diff: 26 lines (+7/-3)2 files modifieddebian/changelog (+7/-0)
debian/puppetmaster.default (+0/-3)
Related bugs
Related blueprints
Branch information
Recent revisions
- 47. By Chuck Short
-
* Merge from debian unstable. Remaining changes:
- debian/puppetmaster- passenger. postinst: Use cacrl instead of hostcrl to
set the location of the CRL in apache2 configuration. Fix apache2
configuration on upgrade as well (LP: #641001)
- move all puppet dependencies to puppet-common since all the code
actually located in puppet-common.
- move libagueas from a recommend to a dependency. - 43. By Mathias Gug
-
* New upstream version
* debian/control:
- move all puppet dependencies to puppet-common since all the code is
actually located in puppet-common.
- move libaugeas from a recommend to a dependency. - 42. By Mathias Gug
-
debian/
puppetmaster- passenger. postinst: Use cacrl instead of hostcrl to
set the location of the CRL in apache2 configuration. Fix apache2
configuration on upgrade as well (LP: #641001). - 41. By Mathias Gug
-
[ Stig Sandbeck Mathisen ]
* Add dependency on "facter" for "puppet-common"
* Make sure the "puppet-common" package can be purged even when not fully
installed (Closes: #596163)[ Mathias Gug ]
* New upstream version. - 40. By Mathias Gug
-
[ Mathias Gug ]
* New upstream version:
- Fix "Puppet standalone broken" (Closes: #594575)
* test/lib/puppettest/ fakes.rb: Fix puppettest to use puppet system
library.[ Stig Sandbeck Mathisen ]
* Fix "require" path for puppet queue. - 39. By Stig Sandbeck Mathisen
-
[ Mathias Gug ]
* New upstream version:
- fix config.ru file to run puppetmaster as a rack application.
(Closes: #593557)
* Fix test suite to run from a package install rather then from the source
directory:
+ Rakefile: use system puppet.rb file to detect version.
+ spec/unit/application/ apply_spec. rb: Fix test suite to use puppet
system library.
+ spec/spec_helper. rb: disable gem.
* Fix init service provider to correctly check the status of services
using upstart jobs (Closes: #584481, LP: #551544).
* etckeeper integration (Closes: #571127)
[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 prerun_command and postrun_command hooks.
+ debian/rules: Install the etckeeper hook scripts in /etc/puppet.
+ debian/README. Debian: add note about etckeeper integration.
+ debian/control: the puppet package suggests etckeeper.
* Create puppetmaster-passenger package to automatically setup the
puppetmaster to be run under mod passenger and apache2:
- create new puppetmaster-common package to share files between
puppetmaster (ie webrick) and puppetmaster-passenger.
- move puppetqd to puppetmaster-common.
- debian/puppet.conf: enable ssl options so that the default configuration
works out of the box under passenger.
* debian/puppet- common. postinst: set permissions and ownership of puppet log
directory.
* Move puppetmaster's Recommends to Suggests.[ Stig Sandbeck Mathisen ]
* Recommend lsb-release (Closes: #593606)
* Recommend debconf-utils (Closes: #593780)
* ext/puppetlast: removed from upstream
* Cherry-pick updated man pages from upstream
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)