diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 17:45:32 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 17:45:32 -0200 |
| commit | 0785451f5599f0c6dad60908a5773742f3188f05 (patch) | |
| tree | 01a55292c915d0e7e327079aa7ee53466c2b717b | |
| parent | bdd3735b6d71966077e9b40d77b03f1b52d8d472 (diff) | |
| download | puppet-apache-0785451f5599f0c6dad60908a5773742f3188f05.tar.gz puppet-apache-0785451f5599f0c6dad60908a5773742f3188f05.tar.bz2 | |
Split classes across files and adding new classes for ruby stuff
| -rw-r--r-- | manifests/init.pp | 24 | ||||
| -rw-r--r-- | manifests/passenger.pp | 11 | ||||
| -rw-r--r-- | manifests/rails.pp | 2 | ||||
| -rw-r--r-- | manifests/ruby.pp | 13 |
4 files changed, 26 insertions, 24 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b445161..5e0aae1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -416,27 +416,3 @@ class apache { refreshonly => true, } } - -class apache::rails inherits apache { - package { "mod_rack": - name => "libapache2-mod-passenger", - ensure => installed, - } - - # Needed by https://git.codecoop.org/projects/coquelicot - package { [ 'libsinatra-ruby1.8', 'libruby1.8', - 'libhaml-ruby1.8', 'liblockfile-ruby', - 'libgettext-ruby1.8', 'libjson-ruby1.8' ]: - ensure => installed, - } - - # Already provided by libruby1.8 package - package { 'libopenssl-ruby1.8': - ensure => absent, - } - - module { "passenger": - ensure => present, - require => Package["mod_rack"], - } -} diff --git a/manifests/passenger.pp b/manifests/passenger.pp new file mode 100644 index 0000000..92230f0 --- /dev/null +++ b/manifests/passenger.pp @@ -0,0 +1,11 @@ +class apache::passenger inherits apache { + package { "mod_rack": + name => "libapache2-mod-passenger", + ensure => installed, + } + + module { "passenger": + ensure => present, + require => Package["mod_rack"], + } +} diff --git a/manifests/rails.pp b/manifests/rails.pp new file mode 100644 index 0000000..18667c9 --- /dev/null +++ b/manifests/rails.pp @@ -0,0 +1,2 @@ +class apache::rails inherits apache::ruby { +} diff --git a/manifests/ruby.pp b/manifests/ruby.pp new file mode 100644 index 0000000..163eaf6 --- /dev/null +++ b/manifests/ruby.pp @@ -0,0 +1,13 @@ +class apache::ruby inherits apache::passenger { + # Needed by https://git.codecoop.org/projects/coquelicot + package { [ 'libsinatra-ruby1.8', 'libruby1.8', + 'libhaml-ruby1.8', 'liblockfile-ruby', + 'libgettext-ruby1.8', 'libjson-ruby1.8' ]: + ensure => installed, + } + + # Already provided by libruby1.8 package + package { 'libopenssl-ruby1.8': + ensure => absent, + } +} |