[gentoo-commits] gentoo-x86 commit in www-apache/passenger/files: 30_mod_passenger-2.0.1.conf 2.0.1-gentoo.patch 1.0.1-gentoo.patch

[Benedikt Boehm (hollow)]

hollow      08/07/01 19:36:17

  Added:                30_mod_passenger-2.0.1.conf 2.0.1-gentoo.patch
  Removed:              1.0.1-gentoo.patch
  Log:
  version bump wrt #229449
  (Portage version: 2.2_pre8/cvs/Linux 2.6.22-vs2.2.0.6-gentoo x86_64)

Revision  Changes    Path
1.1                  www-apache/passenger/files/30_mod_passenger-2.0.1.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/30_mod_passenger-2.0.1.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/30_mod_passenger-2.0.1.conf?rev=1.1&content-type=text/plain

Index: 30_mod_passenger-2.0.1.conf
===================================================================
<IfDefine PASSENGER>
LoadModule passenger_module modules/mod_passenger.so

# The location to the Phusion Passenger root directory. This configuration
# option is essential to Phusion Passenger. The correct value is given by the
# installer, and should usually not be changed manually.
PassengerRoot /usr

# This option allows one to specify how much information Phusion Passenger
# should write to the Apache error log file. A higher log level value means
# that more information will be logged.
#
# Possible values are:
#
#    0: Show only errors and warnings.
#    1: Show the most important debugging information. This might be useful for
#       system administrators who are trying to figure out the cause of a
#       problem.
#    2: Show more debugging information. This is typically only useful for
#       developers.
#    3: Show even more debugging information.
PassengerLogLevel 0

# This option allows one to specify the Ruby interpreter to use.
PassengerRuby /usr/bin/ruby18

# Whether Passenger should automatically detect whether a virtual host's
# document root is a Ruby on Rails application.
RailsAutoDetect On

# The maximum number of Ruby on Rails application instances that may be
# simultaneously active. A larger number results in higher memory usage, but
# improved ability to handle concurrent HTTP clients.
PassengerMaxPoolSize 20

# The maximum number of seconds that a Ruby on Rails application instance may
# be idle. That is, if an application instance hasn't done anything after the
# given number of seconds, then it will be shutdown in order to conserve
# memory.
PassengerPoolIdleTime 120

# The maximum number of application instances that may be simultaneously active
# for a single application. This helps to make sure that a single application
# will not occupy all available slots in the application pool.
#
# This value must be less than PassengerMaxPoolSize. A value of 0 means that
# there is no limit placed on the number of instances a single application may
# use, i.e. only the global limit of PassengerMaxPoolSize will be enforced.
PassengerMaxInstancesPerApp 0

# When the PassengerUserSwitching option is enabled a Rails application is started
# as the owner of the file config/environment.rb. So if
# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will
# launch the corresponding Rails application as joe as well.
PassengerUserSwitching On

# Under no circumstances will Rails applications be run as root. If
# environment.rb is owned by root or by an unknown user, then the Rails
# application will run as the user specified by PassengerDefaultUser.
PassengerDefaultUser apache
</IfDefine>

# vim: ts=4 filetype=apache



1.1                  www-apache/passenger/files/2.0.1-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/2.0.1-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/passenger/files/2.0.1-gentoo.patch?rev=1.1&content-type=text/plain

Index: 2.0.1-gentoo.patch
===================================================================
Index: passenger-2.0.1/Rakefile
===================================================================
--- passenger-2.0.1.orig/Rakefile
+++ passenger-2.0.1/Rakefile
@@ -38,12 +38,8 @@ APR_FLAGS.nil? and raise "Could not find
 
 CXX = "g++"
 THREADING_FLAGS = "-D_REENTRANT"
-if OPTIMIZE
-	OPTIMIZATION_FLAGS = "-O2 -DNDEBUG"
-else
-	OPTIMIZATION_FLAGS = "-g -DPASSENGER_DEBUG"
-end
-CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall -I/usr/local/include #{MULTI_ARCH_FLAGS}"
+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
+CXXFLAGS = "#{THREADING_FLAGS} #{OPTIMIZATION_FLAGS} -Wall #{MULTI_ARCH_FLAGS}"
 LDFLAGS = ""
 
 
@@ -156,7 +152,7 @@ subdir 'ext/apache2' do
 	] do
 		create_executable "ApplicationPoolServerExecutable",
 			'ApplicationPoolServerExecutable.cpp System.o Utils.o Logging.o',
-			"-I.. #{CXXFLAGS} #{LDFLAGS} -DPASSENGER_DEBUG ../boost/src/libboost_thread.a -lpthread"
+			"-I.. #{CXXFLAGS} #{LDFLAGS} ../boost/src/libboost_thread.a -lpthread"
 	end
 	
 	file 'mod_passenger.o' => ['mod_passenger.c'] do
@@ -476,15 +472,15 @@ desc "Create a fakeroot, useful for buil
 task :fakeroot => [:apache2, :native_support, :doc] do
 	require 'rbconfig'
 	include Config
-	fakeroot = "pkg/fakeroot"
+	fakeroot = ENV['DISTDIR']
 
 	# We don't use CONFIG['archdir'] and the like because we want
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
-	libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+	libdir = "#{fakeroot}/#{CONFIG['sitedir']}/#{CONFIG['ruby_version']}"
 	extdir = "#{libdir}/#{CONFIG['arch']}"
 	bindir = "#{fakeroot}/usr/bin"
-	docdir = "#{fakeroot}/usr/share/doc/passenger"
+	docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
 	libexecdir = "#{fakeroot}/usr/lib/passenger"
 	
 	sh "rm -rf #{fakeroot}"
@@ -503,7 +499,6 @@ task :fakeroot => [:apache2, :native_sup
 	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 "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
 	



-- 
gentoo-commits@l.g.o mailing list