Give a lower priority to mod_passenger

This was initially implemented in #1060.

Author: Morgan Haskel

manifests/mod/passenger.pp

@@ -15,9 +15,9 @@
   $passenger_app_env              = undef,
   $mod_package                    = undef,
   $mod_package_ensure             = undef,
-  $mod_lib                        = 'mod_passenger.so',
+  $mod_lib                        = undef,
   $mod_lib_path                   = undef,
-  $mod_id                         = 'passenger_module',
+  $mod_id                         = undef,
   $mod_path                       = undef,
 ) {
   # Managed by the package, but declare it to avoid purging
@@ -56,13 +56,14 @@
 
   $_id = $mod_id
   $_path = $mod_path
-  ::apache::mod { 'zpassenger':
+  ::apache::mod { 'passenger':
     package        => $_package,
     package_ensure => $_package_ensure,
     lib            => $_lib,
     lib_path       => $_lib_path,
     id             => $_id,
     path           => $_path,
+    loadfile_name  => 'zpassenger.load',
   }
 
   # Template uses:

manifests/params.pp

@@ -82,7 +82,7 @@
         default => undef,
       },
       'pagespeed'   => 'mod-pagespeed-stable',
-      'zpassenger'   => 'mod_passenger',
+      'passenger'   => 'mod_passenger',
       'perl'        => 'mod_perl',
       'php5'        => $::apache::version::distrelease ? {
         '5'     => 'php53',
@@ -182,7 +182,7 @@
       'fcgid'       => 'libapache2-mod-fcgid',
       'nss'         => 'libapache2-mod-nss',
       'pagespeed'   => 'mod-pagespeed-stable',
-      'zpassenger'  => 'libapache2-mod-passenger',
+      'passenger'   => 'libapache2-mod-passenger',
       'perl'        => 'libapache2-mod-perl2',
       'php5'        => 'libapache2-mod-php5',
       'proxy_html'  => 'libapache2-mod-proxy-html',
@@ -331,7 +331,7 @@
       # NOTE: not sure where the shibboleth should come from
       'auth_kerb'  => 'www/mod_auth_kerb2',
       'fcgid'      => 'www/mod_fcgid',
-      'zpassenger' => 'www/rubygem-passenger',
+      'passenger'  => 'www/rubygem-passenger',
       'perl'       => 'www/mod_perl2',
       'php5'       => 'www/mod_php5',
       'proxy_html' => 'www/mod_proxy_html',
@@ -391,7 +391,7 @@
       # NOTE: I list here only modules that are not included in www-servers/apache
       'auth_kerb'  => 'www-apache/mod_auth_kerb',
       'fcgid'      => 'www-apache/mod_fcgid',
-      'zpassenger' => 'www-apache/passenger',
+      'passenger'  => 'www-apache/passenger',
       'perl'       => 'www-apache/mod_perl',
       'php5'       => 'dev-lang/php',
       'proxy_html' => 'www-apache/mod_proxy_html',

spec/acceptance/mod_passenger_spec.rb

@@ -6,7 +6,7 @@
     service_name = 'apache2'
     mod_dir = '/etc/apache2/mods-available/'
     conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
+    load_file = "#{mod_dir}zpassenger.load"
 
     case fact('operatingsystem')
     when 'Ubuntu'
@@ -49,7 +49,7 @@
     service_name = 'httpd'
     mod_dir = '/etc/httpd/conf.d/'
     conf_file = "#{mod_dir}passenger.conf"
-    load_file = "#{mod_dir}passenger.load"
+    load_file = "#{mod_dir}zpassenger.load"
     # sometimes installs as 3.0.12, sometimes as 3.0.19 - so just check for the stable part
     passenger_root = '/usr/lib/ruby/gems/1.8/gems/passenger-3.0.1'
     passenger_ruby = '/usr/bin/ruby'

spec/classes/mod/passenger_spec.rb

@@ -20,7 +20,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("libapache2-mod-passenger") }
     it { is_expected.to contain_file('zpassenger.load').with({
       'path' => '/etc/apache2/mods-available/zpassenger.load',
@@ -221,7 +221,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("mod_passenger") }
     it { is_expected.to contain_file('passenger_package.conf').with({
       'path' => '/etc/httpd/conf.d/passenger.conf',
@@ -260,7 +260,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("www/rubygem-passenger") }
   end
   context "on a Gentoo OS" do
@@ -277,7 +277,7 @@
       }
     end
     it { is_expected.to contain_class("apache::params") }
-    it { is_expected.to contain_apache__mod('zpassenger') }
+    it { is_expected.to contain_apache__mod('passenger') }
     it { is_expected.to contain_package("www-apache/passenger") }
   end
 end