diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 15:29:07 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-25 15:29:07 -0200 |
| commit | 5787a464504aca813c4063a712a4b3715ca156b6 (patch) | |
| tree | 83a1b922a7de458b5b393aa38a7dc89be324983b /manifests/master | |
| parent | 0d8f86de91ee8bed32cd86075e98fa40cd8a6141 (diff) | |
| download | puppet-puppet-5787a464504aca813c4063a712a4b3715ca156b6.tar.gz puppet-puppet-5787a464504aca813c4063a712a4b3715ca156b6.tar.bz2 | |
Refactoring for autoloading
Diffstat (limited to 'manifests/master')
| -rw-r--r-- | manifests/master/mongrel.pp | 17 | ||||
| -rw-r--r-- | manifests/master/mongrel/disabled.pp | 16 | ||||
| -rw-r--r-- | manifests/master/passenger.pp | 2 |
3 files changed, 17 insertions, 18 deletions
diff --git a/manifests/master/mongrel.pp b/manifests/master/mongrel.pp index 987c333..5cdf551 100644 --- a/manifests/master/mongrel.pp +++ b/manifests/master/mongrel.pp @@ -30,20 +30,3 @@ class puppet::master::mongrel { } } - -class puppet::master::mongrel::disabled inherits puppet::master::mongrel { - include nginx::puppetmaster::disabled - - Service['puppetmaster'] { - enable => false, - ensure => stopped, - } - - Package['puppetmaster', 'mongrel'] { - ensure => absent, - } - - File['/etc/cron.d/puppetmaster'] { - ensure => absent, - } -} diff --git a/manifests/master/mongrel/disabled.pp b/manifests/master/mongrel/disabled.pp new file mode 100644 index 0000000..84edfd3 --- /dev/null +++ b/manifests/master/mongrel/disabled.pp @@ -0,0 +1,16 @@ +class puppet::master::mongrel::disabled inherits puppet::master::mongrel { + include nginx::puppetmaster::disabled + + Service['puppetmaster'] { + enable => false, + ensure => stopped, + } + + Package['puppetmaster', 'mongrel'] { + ensure => absent, + } + + File['/etc/cron.d/puppetmaster'] { + ensure => absent, + } +} diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp index 221a7a2..01f1dac 100644 --- a/manifests/master/passenger.pp +++ b/manifests/master/passenger.pp @@ -4,7 +4,7 @@ class puppet::master::passenger { include puppet::master::mongrel::disabled # then include puppet class - include puppetd + include puppet::daemon package { 'puppetmaster-passenger': ensure => installed, |