Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use zpassenger.load for passenger #1132

Closed
wants to merge 1 commit into from
Closed

Use zpassenger.load for passenger #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rubygem-passenger/apache-passenger.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
LoadModule passenger_module modules/mod_passenger.so
<IfModule mod_passenger.c>
PassengerRoot @PASSENGERROOT@
PassengerRuby @BINDIR@/ruby
Expand Down
13 changes: 3 additions & 10 deletions rubygem-passenger/rubygem-passenger.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Source1: passenger.logrotate
Source2: rubygem-passenger.tmpfiles
Source10: apache-passenger.conf.in
Source11: locations.ini
Source12: zpassenger.load.in

# Include sys/types.h for GCC 4.7
Patch2: rubygem-passenger-4.0.18-gcc47-include-sys_types.patch
Expand Down Expand Up @@ -315,15 +316,9 @@ install -pm 0755 buildout/apache2/mod_passenger.so %{buildroot}/%{_httpd_moddir}
%{__sed} -e 's|@PASSENGERROOT@|%{gem_instdir}/lib/phusion_passenger/locations.ini|g' %{SOURCE10} > passenger.conf
%{__sed} -i 's|@BINDIR@|%{_bindir}|' passenger.conf

%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
%{__sed} -n /^LoadModule/p passenger.conf > 10-passenger.conf
%{__sed} -i /^LoadModule/d passenger.conf
touch -r %{SOURCE10} 10-passenger.conf
install -pm 0644 10-passenger.conf %{buildroot}%{_httpd_modconfdir}/passenger.conf
%endif
touch -r %{SOURCE10} passenger.conf
install -pm 0644 passenger.conf %{buildroot}%{_httpd_confdir}/passenger.conf

install -pm 0644 %{SOURCE12} %{buildroot}%{_httpd_modconfdir}/zpassenger.load

# Install man pages into the proper location.
%{__mkdir_p} %{buildroot}%{_mandir}/man1
Expand Down Expand Up @@ -439,10 +434,8 @@ rake test --trace ||:
%{gem_instdir}/ext

%files -n %{?scl_prefix}mod_passenger
%if 0%{?rhel} >= 7
%config(noreplace) %{_httpd_confdir}/*.conf
%endif
%config(noreplace) %{_httpd_modconfdir}/*.conf
%config(noreplace) %{_httpd_modconfdir}/*.load
%{_httpd_moddir}/mod_passenger.so
%doc doc/Users?guide?Apache.txt

Expand Down
1 change: 1 addition & 0 deletions rubygem-passenger/zpassenger.load.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LoadModule passenger_module modules/mod_passenger.so