From a67c8f9cf52398ca3728bc79f82e1290dfe99c24 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 11 Feb 2011 12:29:29 -0500 Subject: librack-ruby1.8 should also be managed by the ensure_version --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index ba19f1f..56f933e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,7 +27,7 @@ class passenger { if !defined(Package["librack-ruby"]) { if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } package { - "librack-ruby": + [ "librack-ruby", "librack-ruby1.8"] : ensure => $librack_ensure_version; } } -- cgit v1.2.3 From 177097af548141e26a7738073710a2acfa0fa170 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 9 Apr 2012 11:17:45 -0400 Subject: switch to parameterized class, and allow for gem based installation of passenger --- manifests/init.pp | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 59cdabd..af34c5b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,15 +7,57 @@ # it under the terms of the GNU General Public License version 3 as # published by the Free Software Foundation. -class passenger { +class passenger ( $use_gems = false, $use_munin = true ) +{ + + if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } + if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } + + if ! $use_gems { + if !defined(Package["libapache2-mod-passenger"]) { + package { + "libapache2-mod-passenger": + ensure => $passenger_ensure_version; + } + } + if !defined(Package["librack-ruby"]) { + package { + [ "librack-ruby", "librack-ruby1.8"] : + ensure => $librack_ensure_version; + } + } + else { + package { + "passenger": + provider => gem, + ensure => $passenger_ensure_version; + "rack": + provider => gem, + ensure => $librack_ensure_version; + } + } + } - case $operatingsystem { - debian: { include passenger::debian } - default: { include passenger::base } + apache2::module { + "passenger": ensure => present, require_package => "libapache2-mod-passenger"; } if $use_munin { - include passenger::munin - } + case $passenger_memory_munin_config { '': + { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" } + } + case $passenger_stats_munin_config { '': + { $passenger_stats_munin_config = "user root\n" } + } + + munin::plugin::deploy { + 'passenger_memory_stats': + source => "passenger/munin/passenger_memory_stats", + config => $passenger_memory_munin_config; + 'passenger_stats': + source => "passenger/munin/passenger_stats", + config => $passenger_stats_munin_config; + } + } } -- cgit v1.2.3 From 3d1f3ac213fe48b6864c0f6cca69826a73a47002 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 9 Apr 2012 11:46:47 -0400 Subject: make it so both gem and package work with the apache module loading --- manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index af34c5b..3e6ebb7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,6 +17,7 @@ class passenger ( $use_gems = false, $use_munin = true ) if !defined(Package["libapache2-mod-passenger"]) { package { "libapache2-mod-passenger": + alias => 'passenger', ensure => $passenger_ensure_version; } } @@ -39,7 +40,7 @@ class passenger ( $use_gems = false, $use_munin = true ) } apache2::module { - "passenger": ensure => present, require_package => "libapache2-mod-passenger"; + "passenger": ensure => present, require_package => "passenger"; } if $use_munin { -- cgit v1.2.3 From 69370cff75724e51f9f6c2068ea05bbd84dec8d1 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 9 Apr 2012 12:51:02 -0400 Subject: fix rack check --- manifests/init.pp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 3e6ebb7..4082ef1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,7 @@ class passenger ( $use_gems = false, $use_munin = true ) if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } - if ! $use_gems { + if !$use_gems { if !defined(Package["libapache2-mod-passenger"]) { package { "libapache2-mod-passenger": @@ -32,9 +32,13 @@ class passenger ( $use_gems = false, $use_munin = true ) "passenger": provider => gem, ensure => $passenger_ensure_version; - "rack": - provider => gem, - ensure => $librack_ensure_version; + } + if !defined(Package["rack"]) { + package { + "rack": + provider => gem, + ensure => $librack_ensure_version; + } } } } -- cgit v1.2.3 From 6c4272cf5dbaf2baacad6e175e70fb00b9307e91 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 9 Apr 2012 17:59:24 -0400 Subject: fix logic for $use_gems --- manifests/init.pp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4082ef1..cc2e07d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,7 +13,21 @@ class passenger ( $use_gems = false, $use_munin = true ) if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } - if !$use_gems { + if $use_gems { + package { + "passenger": + provider => gem, + ensure => $passenger_ensure_version; + } + if !defined(Package["rack"]) { + package { + "rack": + provider => gem, + ensure => $librack_ensure_version; + } + } + } + else { if !defined(Package["libapache2-mod-passenger"]) { package { "libapache2-mod-passenger": @@ -27,20 +41,6 @@ class passenger ( $use_gems = false, $use_munin = true ) ensure => $librack_ensure_version; } } - else { - package { - "passenger": - provider => gem, - ensure => $passenger_ensure_version; - } - if !defined(Package["rack"]) { - package { - "rack": - provider => gem, - ensure => $librack_ensure_version; - } - } - } } apache2::module { -- cgit v1.2.3 From 39d499fcb04b3c920f64fc5cc1d8a0933f0a09e4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Jun 2012 22:18:03 -0400 Subject: 2.7 underscore rename --- manifests/base.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/base.pp b/manifests/base.pp index 34ef976..65971a7 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -4,8 +4,8 @@ class passenger::base { apache::config::file { 'mod_passenger': ensure => present, - source => [ "puppet://${server}/modules/site-passenger/${fqdn}/mod_passenger.conf", - "puppet://${server}/modules/site-passenger/mod_passenger.conf", + source => [ "puppet://${server}/modules/site_passenger/${fqdn}/mod_passenger.conf", + "puppet://${server}/modules/site_passenger/mod_passenger.conf", "puppet://${server}/modules/passenger/mod_passenger.conf", ], } -- cgit v1.2.3 From ffdb617e2002fb723a24befaee5171ef5bcf05a0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 8 Jul 2012 21:36:20 -0400 Subject: Passenger Module: apache2::module doesn't exist in apache module, this updates things to work with the apache module which includes the class apache::module --- manifests/debian.pp | 1 + manifests/init.pp | 47 +++++++++++++++++++---------------------------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/manifests/debian.pp b/manifests/debian.pp index f351111..f82c63f 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,6 +3,7 @@ class passenger::debian inherits passenger::base { if !defined(Package["libapache2-mod-passenger"]) { if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } apache::debian::module { 'passenger': + module => 'passenger', ensure => $passenger_ensure_version, package_name => 'libapache2-mod-passenger'; } diff --git a/manifests/init.pp b/manifests/init.pp index cc2e07d..d4132d3 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -7,46 +7,37 @@ # it under the terms of the GNU General Public License version 3 as # published by the Free Software Foundation. -class passenger ( $use_gems = false, $use_munin = true ) +class passenger ( + $use_gems = false, $use_munin = true, + $passenger_ensure_version = 'installed', + $librack_ensure_version = 'installed' ) { - if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } - if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } - - if $use_gems { - package { - "passenger": - provider => gem, - ensure => $passenger_ensure_version; + if ! $use_gems { + class { 'apache::module': + module => 'passenger', + ensure => $passenger_ensure_version, + package_name => 'libapache2-mod-passenger'; } - if !defined(Package["rack"]) { + + if !defined(Package["librack-ruby"]) { package { - "rack": - provider => gem, + [ "librack-ruby", "librack-ruby1.8"] : ensure => $librack_ensure_version; } } } else { - if !defined(Package["libapache2-mod-passenger"]) { - package { - "libapache2-mod-passenger": - alias => 'passenger', - ensure => $passenger_ensure_version; - } - } - if !defined(Package["librack-ruby"]) { - package { - [ "librack-ruby", "librack-ruby1.8"] : - ensure => $librack_ensure_version; - } + package { + "passenger": + provider => gem, + ensure => $passenger_ensure_version; + "rack": + provider => gem, + ensure => $librack_ensure_version; } } - apache2::module { - "passenger": ensure => present, require_package => "passenger"; - } - if $use_munin { case $passenger_memory_munin_config { '': { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" } -- cgit v1.2.3 From 2ea883f5c04b5935ca83bd927f178e934312e0c4 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 8 Jul 2012 21:53:54 -0400 Subject: there was a start at abstracting out the classes, but this is not needed at this point, so I've pulled it all in to simplify it --- manifests/base.pp | 13 ------------- manifests/debian.pp | 20 -------------------- manifests/init.pp | 10 +++++++++- 3 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 manifests/base.pp delete mode 100644 manifests/debian.pp diff --git a/manifests/base.pp b/manifests/base.pp deleted file mode 100644 index 65971a7..0000000 --- a/manifests/base.pp +++ /dev/null @@ -1,13 +0,0 @@ -class passenger::base { - - include apache - - apache::config::file { 'mod_passenger': - ensure => present, - source => [ "puppet://${server}/modules/site_passenger/${fqdn}/mod_passenger.conf", - "puppet://${server}/modules/site_passenger/mod_passenger.conf", - "puppet://${server}/modules/passenger/mod_passenger.conf", - ], - } - -} diff --git a/manifests/debian.pp b/manifests/debian.pp deleted file mode 100644 index f82c63f..0000000 --- a/manifests/debian.pp +++ /dev/null @@ -1,20 +0,0 @@ -class passenger::debian inherits passenger::base { - - if !defined(Package["libapache2-mod-passenger"]) { - if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' } - apache::debian::module { 'passenger': - module => 'passenger', - ensure => $passenger_ensure_version, - package_name => 'libapache2-mod-passenger'; - } - } - - if !defined(Package["librack-ruby"]) { - if $librack_ensure_version == '' { $librack_ensure_version = 'installed' } - package { - "librack-ruby": - ensure => $librack_ensure_version; - } - } - -} diff --git a/manifests/init.pp b/manifests/init.pp index d4132d3..22be7cf 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -37,7 +37,15 @@ class passenger ( ensure => $librack_ensure_version; } } - + + apache::config::file { 'mod_passenger': + ensure => present, + source => [ "puppet://${server}/modules/site_passenger/${fqdn}/mod_passenger.conf", + "puppet://${server}/modules/site_passenger/mod_passenger.conf", + "puppet://${server}/modules/passenger/mod_passenger.conf", + ], + } + if $use_munin { case $passenger_memory_munin_config { '': { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" } -- cgit v1.2.3