[DRE-commits] [ruby-passenger] 09/17: Point PassengerRoot to the locations.ini in passenger.conf.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit 9c0cf32ad87fb19c426a7c2df3fba5ad55bb66be
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Aug 5 20:40:23 2013 +0200

    Point PassengerRoot to the locations.ini in passenger.conf.
---
 debian/changelog      |    1 +
 debian/passenger.conf |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13c4ea5..e0f5c4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ruby-passenger (4.0.10-1) UNRELEASED; urgency=low
   * Refresh fix_install_path.patch.
   * Drop fix_ftbfs_glibc217.patch, CVE-2013-2119.patch and CVE-2013-4136.patch,
     applied upstream.
+  * Point PassengerRoot to the locations.ini in passenger.conf.
   * Add myself as Uploader.
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 05 Aug 2013 20:31:08 +0200
diff --git a/debian/passenger.conf b/debian/passenger.conf
index e430c44..7761bf5 100644
--- a/debian/passenger.conf
+++ b/debian/passenger.conf
@@ -1,4 +1,4 @@
 <IfModule mod_passenger.c>
-  PassengerRoot /usr
-  PassengerRuby /usr/bin/ruby
+  PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+  PassengerDefaultRuby /usr/bin/ruby
 </IfModule>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git