diff options
| author | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-08-22 13:43:08 -0400 |
| commit | 24e4503906c5ffef236814b003d1fd629989fc40 (patch) | |
| tree | 1721fb6c2387d6cab5c6e6aaa9ab937b52c559f3 /manifests/puppetmaster/package | |
| parent | 04d8317eb5b70aba62c2b18f6b1bd1d03aedeb5b (diff) | |
| parent | ed7d89163385a6eab4423aae7ce8b5d994339a2f (diff) | |
Merge remote-tracking branch 'riseup/master'
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
Diffstat (limited to 'manifests/puppetmaster/package')
| -rw-r--r-- | manifests/puppetmaster/package/base.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetmaster/package/debian.pp | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/manifests/puppetmaster/package/base.pp b/manifests/puppetmaster/package/base.pp index 363f827..ff8d02a 100644 --- a/manifests/puppetmaster/package/base.pp +++ b/manifests/puppetmaster/package/base.pp @@ -4,7 +4,9 @@ class puppet::puppetmaster::package::base inherits puppet::puppetmaster::package ensure => present, } - Service['puppetmaster']{ - require +> Package['puppetmaster'], + if $puppetmaster_mode != 'passenger' { + Service['puppetmaster']{ + require +> Package['puppetmaster'], + } } } diff --git a/manifests/puppetmaster/package/debian.pp b/manifests/puppetmaster/package/debian.pp index 21407bb..cea7ac4 100644 --- a/manifests/puppetmaster/package/debian.pp +++ b/manifests/puppetmaster/package/debian.pp @@ -1,6 +1,13 @@ -class puppet::puppetmaster::package::debian inherits puppet::puppetmaster::package { +class puppet::puppetmaster::package::debian { - #Package['puppetmaster']{ - # require => Package['puppetmaster-common'] - #} + include puppet::puppetmaster::package::base + + apt::preferences_snippet { + 'puppet_passenger': + package => 'puppet*', + pin => "version $puppetmaster_ensure_version", + priority => 2000, + notify => Exec['refresh_apt'], + before => Package['puppetmaster']; + } } |