Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move passenger-spawn-server from /usr/bin to /usr/lib/passenger.

  • Loading branch information...
commit 0c888b8450032881bf2ccb3354ba3a792cb3c381 1 parent 7a3a4a0
@FooBarWidget FooBarWidget authored
Showing with 10 additions and 7 deletions.
  1. +6 −5 Rakefile
  2. +4 −2 bin/passenger-install-apache2-module
View
11 Rakefile
@@ -426,7 +426,7 @@ task :fakeroot => [:apache2, :native_support, :doc] do
extdir = "#{libdir}/#{CONFIG['arch']}"
bindir = "#{fakeroot}/usr/bin"
docdir = "#{fakeroot}/usr/share/doc/passenger"
- libexecdir = "#{fakeroot}/usr/libexec/passenger"
+ libexecdir = "#{fakeroot}/usr/lib/passenger"
sh "rm -rf #{fakeroot}"
sh "mkdir -p #{fakeroot}"
@@ -440,15 +440,16 @@ task :fakeroot => [:apache2, :native_support, :doc] do
sh "mkdir -p #{extdir}/passenger"
sh "cp -R ext/passenger/*.#{LIBEXT} #{extdir}/passenger/"
- sh "mkdir -p #{libexecdir}"
- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
-
sh "mkdir -p #{bindir}"
sh "cp bin/* #{bindir}/"
+ sh "mkdir -p #{libexecdir}"
+ sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
+ sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
+
sh "mkdir -p #{docdir}"
sh "cp -R doc/* #{docdir}/"
- sh "rm -f #{docdir}/{definitions.h,Doxyfile}"
+ sh "rm", "-rf", *Dir["#{docdir}/{definitions.h,Doxyfile,template}"]
end
desc "Create a Debian package"
View
6 bin/passenger-install-apache2-module
@@ -190,13 +190,15 @@ private
puts
line
if natively_packaged?
- module_location = "#{PASSENGER_ROOT}/libexec/passenger/mod_passenger.so"
+ module_location = "#{PASSENGER_ROOT}/lib/passenger/mod_passenger.so"
+ spawn_server_location = "#{PASSENGER_ROOT}/lib/passenger/passenger-spawn-server"
else
module_location = "#{PASSENGER_ROOT}/ext/apache2/mod_passenger.so"
+ spawn_server_location = "#{PASSENGER_ROOT}/bin/passenger-spawn-server"
end
render_template 'apache2_config_snippets',
:module_location => module_location,
- :spawn_server_location => "#{PASSENGER_ROOT}/bin/passenger-spawn-server",
+ :spawn_server_location => spawn_server_location,
:ruby => RUBY
if natively_packaged?
wait(10)
Please sign in to comment.
Something went wrong with that request. Please try again.