Use zpassenger.load for passenger

theforeman · May 27, 2016 · 6f8f017 · 6f8f017
1 parent a497e63
commit 6f8f017
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/rubygem-passenger/apache-passenger.conf.in b/rubygem-passenger/apache-passenger.conf.in
@@ -1,4 +1,3 @@
-LoadModule passenger_module modules/mod_passenger.so
 <IfModule mod_passenger.c>
    PassengerRoot @PASSENGERROOT@
    PassengerRuby @BINDIR@/ruby

diff --git a/rubygem-passenger/rubygem-passenger.spec b/rubygem-passenger/rubygem-passenger.spec
@@ -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
@@ -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
@@ -442,7 +437,7 @@ rake test --trace ||:
 %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
 

diff --git a/rubygem-passenger/zpassenger.load.in b/rubygem-passenger/zpassenger.load.in
@@ -0,0 +1 @@
+LoadModule passenger_module modules/mod_passenger.so
diff --git a/setup_sources.sh b/setup_sources.sh
@@ -9,5 +9,8 @@ for spec in $dir/*.spec; do
   sourcebase=$(basename "$source0")
   [ -h $d/$sourcebase ] || continue
   git annex whereis "$d/$sourcebase" 2>/dev/null | grep -q " web" && continue
+  #debug
+  #why too many redirects on jenkins?
+  echo "running git annex addurl --file $d/$sourcebase $source0"
   git annex addurl --file "$d/$sourcebase" "$source0"
 done
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		LoadModule passenger_module modules/mod_passenger.so