Skip to content

Commit 641357d

Browse files
igalicigalic
committed
Merge pull request #1060 from stevenpost/fixes/passenger_loadorder
give a lower priority to mod_passenger
2 parents 7563690 + 4270df4 commit 641357d

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎manifests/mod/passenger.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
$passenger_app_env = undef,
1616
$mod_package = undef,
1717
$mod_package_ensure = undef,
18-
$mod_lib = undef,
18+
$mod_lib = 'mod_passenger.so',
1919
$mod_lib_path = undef,
20-
$mod_id = undef,
20+
$mod_id = 'passenger_module',
2121
$mod_path = undef,
2222
) {
2323
# Managed by the package, but declare it to avoid purging
@@ -56,7 +56,7 @@
5656

5757
$_id = $mod_id
5858
$_path = $mod_path
59-
::apache::mod { 'passenger':
59+
::apache::mod { 'zpassenger':
6060
package => $_package,
6161
package_ensure => $_package_ensure,
6262
lib => $_lib,

‎manifests/params.pp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
default => undef,
8383
},
8484
'pagespeed' => 'mod-pagespeed-stable',
85-
'passenger' => 'mod_passenger',
85+
'zpassenger' => 'mod_passenger',
8686
'perl' => 'mod_perl',
8787
'php5' => $::apache::version::distrelease ? {
8888
'5' => 'php53',
@@ -182,7 +182,7 @@
182182
'fcgid' => 'libapache2-mod-fcgid',
183183
'nss' => 'libapache2-mod-nss',
184184
'pagespeed' => 'mod-pagespeed-stable',
185-
'passenger' => 'libapache2-mod-passenger',
185+
'zpassenger' => 'libapache2-mod-passenger',
186186
'perl' => 'libapache2-mod-perl2',
187187
'php5' => 'libapache2-mod-php5',
188188
'proxy_html' => 'libapache2-mod-proxy-html',
@@ -331,7 +331,7 @@
331331
# NOTE: not sure where the shibboleth should come from
332332
'auth_kerb' => 'www/mod_auth_kerb2',
333333
'fcgid' => 'www/mod_fcgid',
334-
'passenger' => 'www/rubygem-passenger',
334+
'zpassenger' => 'www/rubygem-passenger',
335335
'perl' => 'www/mod_perl2',
336336
'php5' => 'www/mod_php5',
337337
'proxy_html' => 'www/mod_proxy_html',
@@ -391,7 +391,7 @@
391391
# NOTE: I list here only modules that are not included in www-servers/apache
392392
'auth_kerb' => 'www-apache/mod_auth_kerb',
393393
'fcgid' => 'www-apache/mod_fcgid',
394-
'passenger' => 'www-apache/passenger',
394+
'zpassenger' => 'www-apache/passenger',
395395
'perl' => 'www-apache/mod_perl',
396396
'php5' => 'dev-lang/php',
397397
'proxy_html' => 'www-apache/mod_proxy_html',

‎spec/classes/mod/passenger_spec.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
}
2121
end
2222
it { is_expected.to contain_class("apache::params") }
23-
it { is_expected.to contain_apache__mod('passenger') }
23+
it { is_expected.to contain_apache__mod('zpassenger') }
2424
it { is_expected.to contain_package("libapache2-mod-passenger") }
25-
it { is_expected.to contain_file('passenger.load').with({
26-
'path' => '/etc/apache2/mods-available/passenger.load',
25+
it { is_expected.to contain_file('zpassenger.load').with({
26+
'path' => '/etc/apache2/mods-available/zpassenger.load',
2727
}) }
2828
it { is_expected.to contain_file('passenger.conf').with({
2929
'path' => '/etc/apache2/mods-available/passenger.conf',
@@ -105,25 +105,25 @@
105105
let :params do
106106
{ :mod_path => '/usr/lib/foo/mod_foo.so' }
107107
end
108-
it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
108+
it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_foo\.so$/) }
109109
end
110110
describe "with mod_lib_path => '/usr/lib/foo'" do
111111
let :params do
112112
{ :mod_lib_path => '/usr/lib/foo' }
113113
end
114-
it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
114+
it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/foo\/mod_passenger\.so$/) }
115115
end
116116
describe "with mod_lib => 'mod_foo.so'" do
117117
let :params do
118118
{ :mod_lib => 'mod_foo.so' }
119119
end
120-
it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
120+
it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule passenger_module \/usr\/lib\/apache2\/modules\/mod_foo\.so$/) }
121121
end
122122
describe "with mod_id => 'mod_foo'" do
123123
let :params do
124124
{ :mod_id => 'mod_foo' }
125125
end
126-
it { is_expected.to contain_file('passenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
126+
it { is_expected.to contain_file('zpassenger.load').with_content(/^LoadModule mod_foo \/usr\/lib\/apache2\/modules\/mod_passenger\.so$/) }
127127
end
128128

129129
context "with Ubuntu 12.04 defaults" do
@@ -221,15 +221,15 @@
221221
}
222222
end
223223
it { is_expected.to contain_class("apache::params") }
224-
it { is_expected.to contain_apache__mod('passenger') }
224+
it { is_expected.to contain_apache__mod('zpassenger') }
225225
it { is_expected.to contain_package("mod_passenger") }
226226
it { is_expected.to contain_file('passenger_package.conf').with({
227227
'path' => '/etc/httpd/conf.d/passenger.conf',
228228
}) }
229229
it { is_expected.to contain_file('passenger_package.conf').without_content }
230230
it { is_expected.to contain_file('passenger_package.conf').without_source }
231-
it { is_expected.to contain_file('passenger.load').with({
232-
'path' => '/etc/httpd/conf.d/passenger.load',
231+
it { is_expected.to contain_file('zpassenger.load').with({
232+
'path' => '/etc/httpd/conf.d/zpassenger.load',
233233
}) }
234234
it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRoot/) }
235235
it { is_expected.to contain_file('passenger.conf').without_content(/PassengerRuby/) }
@@ -260,7 +260,7 @@
260260
}
261261
end
262262
it { is_expected.to contain_class("apache::params") }
263-
it { is_expected.to contain_apache__mod('passenger') }
263+
it { is_expected.to contain_apache__mod('zpassenger') }
264264
it { is_expected.to contain_package("www/rubygem-passenger") }
265265
end
266266
context "on a Gentoo OS" do
@@ -277,7 +277,7 @@
277277
}
278278
end
279279
it { is_expected.to contain_class("apache::params") }
280-
it { is_expected.to contain_apache__mod('passenger') }
280+
it { is_expected.to contain_apache__mod('zpassenger') }
281281
it { is_expected.to contain_package("www-apache/passenger") }
282282
end
283283
end

0 commit comments

Comments
 (0)