1 |
commit: e10214086dd87aa49b4884408e999c3220095a27 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 11 05:36:14 2017 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 05:36:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1021408 |
7 |
|
8 |
www-apache/passenger: remove unused files |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
.../passenger/files/30_mod_passenger-4.0.0.conf | 63 ---------------------- |
13 |
.../passenger/files/passenger-4.0.49-gentoo.patch | 30 ----------- |
14 |
2 files changed, 93 deletions(-) |
15 |
|
16 |
diff --git a/www-apache/passenger/files/30_mod_passenger-4.0.0.conf b/www-apache/passenger/files/30_mod_passenger-4.0.0.conf |
17 |
deleted file mode 100644 |
18 |
index f218b59ca41..00000000000 |
19 |
--- a/www-apache/passenger/files/30_mod_passenger-4.0.0.conf |
20 |
+++ /dev/null |
21 |
@@ -1,63 +0,0 @@ |
22 |
-<IfDefine PASSENGER> |
23 |
-LoadModule passenger_module modules/mod_passenger.so |
24 |
- |
25 |
-# The location to the Phusion Passenger root directory. This configuration |
26 |
-# option is essential to Phusion Passenger. The correct value is given by the |
27 |
-# installer, and should usually not be changed manually. |
28 |
-PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini |
29 |
- |
30 |
-# This option allows one to specify how much information Phusion Passenger |
31 |
-# should write to the Apache error log file. A higher log level value means |
32 |
-# that more information will be logged. |
33 |
-# |
34 |
-# Possible values are: |
35 |
-# |
36 |
-# 0: Show only errors and warnings. |
37 |
-# 1: Show the most important debugging information. This might be useful for |
38 |
-# system administrators who are trying to figure out the cause of a |
39 |
-# problem. |
40 |
-# 2: Show more debugging information. This is typically only useful for |
41 |
-# developers. |
42 |
-# 3: Show even more debugging information. |
43 |
-PassengerLogLevel 0 |
44 |
- |
45 |
-# This option specifies the default global version of Ruby to use. |
46 |
-PassengerDefaultRuby /usr/bin/ruby |
47 |
- |
48 |
-# This option allows one to specify the Ruby interpreter to use for |
49 |
-# specific instances. |
50 |
-# PassengerRuby /usr/bin/ruby |
51 |
- |
52 |
-# The maximum number of Ruby on Rails application instances that may be |
53 |
-# simultaneously active. A larger number results in higher memory usage, but |
54 |
-# improved ability to handle concurrent HTTP clients. |
55 |
-PassengerMaxPoolSize 20 |
56 |
- |
57 |
-# The maximum number of seconds that a Ruby on Rails application instance may |
58 |
-# be idle. That is, if an application instance hasn't done anything after the |
59 |
-# given number of seconds, then it will be shutdown in order to conserve |
60 |
-# memory. |
61 |
-PassengerPoolIdleTime 120 |
62 |
- |
63 |
-# The maximum number of application instances that may be simultaneously active |
64 |
-# for a single application. This helps to make sure that a single application |
65 |
-# will not occupy all available slots in the application pool. |
66 |
-# |
67 |
-# This value must be less than PassengerMaxPoolSize. A value of 0 means that |
68 |
-# there is no limit placed on the number of instances a single application may |
69 |
-# use, i.e. only the global limit of PassengerMaxPoolSize will be enforced. |
70 |
-PassengerMaxInstancesPerApp 0 |
71 |
- |
72 |
-# When the PassengerUserSwitching option is enabled a Rails application is started |
73 |
-# as the owner of the file config/environment.rb. So if |
74 |
-# /home/webapps/foo/config/environment.rb is owned by joe, then Passenger will |
75 |
-# launch the corresponding Rails application as joe as well. |
76 |
-PassengerUserSwitching On |
77 |
- |
78 |
-# Under no circumstances will Rails applications be run as root. If |
79 |
-# environment.rb is owned by root or by an unknown user, then the Rails |
80 |
-# application will run as the user specified by PassengerDefaultUser. |
81 |
-PassengerDefaultUser apache |
82 |
-</IfDefine> |
83 |
- |
84 |
-# vim: ts=4 filetype=apache |
85 |
|
86 |
diff --git a/www-apache/passenger/files/passenger-4.0.49-gentoo.patch b/www-apache/passenger/files/passenger-4.0.49-gentoo.patch |
87 |
deleted file mode 100644 |
88 |
index 8365fbd20fb..00000000000 |
89 |
--- a/www-apache/passenger/files/passenger-4.0.49-gentoo.patch |
90 |
+++ /dev/null |
91 |
@@ -1,30 +0,0 @@ |
92 |
---- build/packaging.rb.~1~ 2013-10-27 00:00:00.000000000 +0200 |
93 |
-+++ build/packaging.rb 2014-08-23 08:35:20.372738004 +0200 |
94 |
-@@ -429,7 +429,7 @@ |
95 |
- psg_ruby_extension_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source" |
96 |
- psg_nginx_module_source_dir = "#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module" |
97 |
- |
98 |
-- fakeroot = "pkg/fakeroot" |
99 |
-+ fakeroot = ENV['DISTDIR'] |
100 |
- fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}" |
101 |
- fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}" |
102 |
- fake_libdir = "#{fakeroot}#{psg_libdir}" |
103 |
-@@ -447,7 +447,6 @@ |
104 |
- |
105 |
- native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb" |
106 |
- |
107 |
-- sh "rm -rf #{fakeroot}" |
108 |
- sh "mkdir -p #{fakeroot}" |
109 |
- |
110 |
- # Ruby sources |
111 |
-@@ -532,10 +531,6 @@ |
112 |
- end |
113 |
- end |
114 |
- |
115 |
-- # Apache 2 module |
116 |
-- sh "mkdir -p #{File.dirname(fake_apache2_module_path)}" |
117 |
-- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}" |
118 |
-- |
119 |
- # Ruby extension sources |
120 |
- sh "mkdir -p #{fake_ruby_extension_source_dir}" |
121 |
- sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* #{fake_ruby_extension_source_dir}" |