summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2009-09-17 07:15:53 +0000
committerBenedikt Boehm <hollow@gentoo.org>2009-09-17 07:15:53 +0000
commitd80650c7c28c59eaf599ccf6f2c4713b06ac3f0e (patch)
tree7b11a1151ac93ef4b0e01141889113c588eb3d60 /www-apache/passenger/files
parentversion bump wrt #285259 & #269791 (diff)
downloadgentoo-2-d80650c7c28c59eaf599ccf6f2c4713b06ac3f0e.tar.gz
gentoo-2-d80650c7c28c59eaf599ccf6f2c4713b06ac3f0e.tar.bz2
gentoo-2-d80650c7c28c59eaf599ccf6f2c4713b06ac3f0e.zip
version bump
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'www-apache/passenger/files')
-rw-r--r--www-apache/passenger/files/2.2.2-gentoo.patch42
-rw-r--r--www-apache/passenger/files/30_mod_passenger.conf39
2 files changed, 0 insertions, 81 deletions
diff --git a/www-apache/passenger/files/2.2.2-gentoo.patch b/www-apache/passenger/files/2.2.2-gentoo.patch
deleted file mode 100644
index cd51913b9099..000000000000
--- a/www-apache/passenger/files/2.2.2-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Rakefile.~1~ 2009-05-19 11:48:28.236986307 +0200
-+++ Rakefile 2009-05-19 11:50:53.000000000 +0200
-@@ -38,11 +38,7 @@
-
- CXX = "g++"
- LIBEXT = PlatformInfo.library_extension
--if OPTIMIZE
-- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
--else
-- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
--end
-+OPTIMIZATION_FLAGS = "#{ENV['CXXFLAGS']} -DNDEBUG"
-
- # Extra compiler flags that should always be passed to the C/C++ compiler.
- # Should be included last in the command string.
-@@ -733,15 +729,15 @@
- 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/phusion_passenger"
-+ docdir = "#{fakeroot}/usr/share/doc/passenger-#{PACKAGE_VERSION}"
- libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
-
- sh "rm -rf #{fakeroot}"
-@@ -757,7 +753,6 @@
- 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}/"
-
diff --git a/www-apache/passenger/files/30_mod_passenger.conf b/www-apache/passenger/files/30_mod_passenger.conf
deleted file mode 100644
index 4cf0a29f75c6..000000000000
--- a/www-apache/passenger/files/30_mod_passenger.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-<IfDefine PASSENGER>
-LoadModule passenger_module modules/mod_passenger.so
-
-# The location to the Passenger spawn server. This configuration option is
-# essential to Passenger. The correct value is given by the ebuild, and should
-# usually not be changed manually.
-RailsSpawnServer /usr/bin/passenger-spawn-server
-
-# This option allows one to specify the Ruby interpreter to use.
-RailsRuby /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.
-RailsMaxPoolSize 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.
-RailsPoolIdleTime 120
-
-# When the RailsUserSwitching 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.
-RailsUserSwitching 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 RailsDefaultUser.
-RailsDefaultUser apache
-</IfDefine>
-
-# vim: ts=4 filetype=apache