1 |
commit: db258b5062a86633f4746f4b8d7e2d0470334501 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 11 13:35:51 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 11 13:37:27 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db258b50 |
7 |
|
8 |
app-eselect/eselect-php: Drop old |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
app-eselect/eselect-php/Manifest | 4 -- |
13 |
.../eselect-php/eselect-php-0.7.1-r4.ebuild | 48 --------------- |
14 |
.../eselect-php/eselect-php-0.7.1-r7.ebuild | 41 ------------- |
15 |
.../eselect-php/eselect-php-0.8.2-r1.ebuild | 58 ------------------ |
16 |
app-eselect/eselect-php/eselect-php-0.8.5.ebuild | 58 ------------------ |
17 |
app-eselect/eselect-php/eselect-php-0.9.1.ebuild | 66 -------------------- |
18 |
app-eselect/eselect-php/files/70_mod_php.conf | 26 -------- |
19 |
.../eselect-php/files/70_mod_php5.conf-apache2-r1 | 18 ------ |
20 |
app-eselect/eselect-php/files/php-fpm-r1.init | 50 ---------------- |
21 |
app-eselect/eselect-php/files/php-fpm.init-r4 | 70 ---------------------- |
22 |
app-eselect/eselect-php/files/php-fpm_at.service | 14 ----- |
23 |
11 files changed, 453 deletions(-) |
24 |
|
25 |
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest |
26 |
index be9c960..ca18cbf 100644 |
27 |
--- a/app-eselect/eselect-php/Manifest |
28 |
+++ b/app-eselect/eselect-php/Manifest |
29 |
@@ -1,5 +1 @@ |
30 |
-DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b |
31 |
-DIST eselect-php-0.8.2.tar.xz 51832 SHA256 3601d0612a19ccc1c5146be2c8cd7df955a37c517817ae4f59bb3ead446f5355 SHA512 da1d71affe275d07db7a76fd98fd89ffdea6f671262a615bf4dda5a1bba8d19e5d1a3c8afe3f1eb1e70fd71298476a6f0d4e73eba7aafe7555f018f89005bc3d WHIRLPOOL dcc75d93eeaaa85f63f5329491d010debd83ed2a82af0051d59ab4aff639703a6f4c1baa5388ed2a8867d6ab610740d5a1ac86d28cddb0de5be47872ada040b4 |
32 |
-DIST eselect-php-0.8.5.tar.xz 45800 SHA256 73b1dfab538dad971644ae9542e311cd9160e5dff3947086fc7691f0fedb835d SHA512 dbb97ddca2cd031e57e1efccc2a92dcb7aa3c4a4813c72dc5ad688b8e32e4e2ec8083781c450e9c439a9e70f04c26249e335a4eb814ac944dfc6e2d06ca724f6 WHIRLPOOL 00d8a1b6e065962105b704e8a6ab806c6f8181a4ec4c266902854ce61cb4532063412449c623ea7288e49dd64c4a8b762b9771abb89664071ff81b7b9728a8e5 |
33 |
-DIST eselect-php-0.9.1.tar.xz 47548 SHA256 0c9768c9dd361dd3910f26e11956fc2121467ab56c52ba80d7620b1d757bc143 SHA512 bea84b4ae386d60cea2703d1b1c2a91bdc19188dfe151619750a1979dcfbdf2a2ada05d87faa7e0f371ab003e05be6fc7dd15f96459ae6e998c62e6d5caeb64a WHIRLPOOL 3d74edfa6962942836aa3823e9901b461433ce57f2fcb624eb1652b36245599a1bc076db5cb902b675747f2255f00ac887a5e35859dbcf62279944595ea02d6c |
34 |
DIST eselect-php-0.9.2.tar.xz 48356 SHA256 8b2acfccb3d2e3d7cad137fc4306711371ebd544cbcdad8e9d46c5dacf8ed889 SHA512 ebf4c9039aaa3ffad79dee181b5cd77f144a4b1b49d80291b290377b7ca5a9618d8b18922f0624e646c4d80266c58199bb936a7b8dd5d2e2bdc296099f583edf WHIRLPOOL 5ca0673a80b5e88522ff1ca82c4b4f842a63439cd47562c72048a4d66dc88d2dcc7070c28c0b8ff50a75bdb1a9056ee5391b37f4dc34cc9eda3652c6791a276c |
35 |
|
36 |
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild |
37 |
deleted file mode 100644 |
38 |
index bb6b500..00000000 |
39 |
--- a/app-eselect/eselect-php/eselect-php-0.7.1-r4.ebuild |
40 |
+++ /dev/null |
41 |
@@ -1,48 +0,0 @@ |
42 |
-# Copyright 1999-2015 Gentoo Foundation |
43 |
-# Distributed under the terms of the GNU General Public License v2 |
44 |
-# $Id$ |
45 |
- |
46 |
-EAPI=5 |
47 |
- |
48 |
-inherit depend.apache systemd |
49 |
- |
50 |
-DESCRIPTION="PHP eselect module" |
51 |
-HOMEPAGE="https://www.gentoo.org" |
52 |
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" |
53 |
- |
54 |
-LICENSE="GPL-2" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
57 |
-IUSE="fpm apache2" |
58 |
- |
59 |
-DEPEND=">=app-admin/eselect-1.2.4 |
60 |
- !<dev-lang/php-5.3.23-r1:5.3 |
61 |
- !<dev-lang/php-5.4.13-r1:5.4 |
62 |
- !<dev-lang/php-5.5.0_beta1-r2:5.5 |
63 |
- " |
64 |
-RDEPEND="${DEPEND}" |
65 |
- |
66 |
-S="${WORKDIR}" |
67 |
- |
68 |
-want_apache |
69 |
- |
70 |
-src_install() { |
71 |
- mv eselect-php-${PV} php.eselect |
72 |
- insinto /usr/share/eselect/modules/ |
73 |
- doins php.eselect |
74 |
- |
75 |
- if use apache2 ; then |
76 |
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" |
77 |
- newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" \ |
78 |
- "70_mod_php5.conf" |
79 |
- fi |
80 |
- |
81 |
- if use fpm ; then |
82 |
- dodir "/etc/init.d" |
83 |
- insinto "/etc/init.d" |
84 |
- newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm" |
85 |
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
86 |
- exeinto /usr/libexec |
87 |
- doexe "${FILESDIR}/php-fpm-launcher" |
88 |
- fi |
89 |
-} |
90 |
|
91 |
diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r7.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r7.ebuild |
92 |
deleted file mode 100644 |
93 |
index 6937b4a..00000000 |
94 |
--- a/app-eselect/eselect-php/eselect-php-0.7.1-r7.ebuild |
95 |
+++ /dev/null |
96 |
@@ -1,41 +0,0 @@ |
97 |
-# Copyright 1999-2015 Gentoo Foundation |
98 |
-# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $Id$ |
100 |
- |
101 |
-EAPI=5 |
102 |
- |
103 |
-inherit depend.apache systemd |
104 |
- |
105 |
-DESCRIPTION="PHP eselect module" |
106 |
-HOMEPAGE="https://www.gentoo.org" |
107 |
-SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" |
108 |
- |
109 |
-LICENSE="GPL-2" |
110 |
-SLOT="0" |
111 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
112 |
-IUSE="fpm apache2" |
113 |
- |
114 |
-# The "DirectoryIndex" line in 70_mod_php5.conf requires mod_dir. |
115 |
-RDEPEND="app-admin/eselect |
116 |
- apache2? ( www-servers/apache[apache2_modules_dir] )" |
117 |
-S="${WORKDIR}" |
118 |
- |
119 |
-want_apache |
120 |
- |
121 |
-src_install() { |
122 |
- insinto /usr/share/eselect/modules/ |
123 |
- newins "eselect-php-${PV}" php.eselect |
124 |
- |
125 |
- if use apache2 ; then |
126 |
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" |
127 |
- newins "${FILESDIR}/70_mod_php5.conf-apache2-r1" \ |
128 |
- "70_mod_php5.conf" |
129 |
- fi |
130 |
- |
131 |
- if use fpm ; then |
132 |
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm" |
133 |
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
134 |
- exeinto /usr/libexec |
135 |
- doexe "${FILESDIR}/php-fpm-launcher" |
136 |
- fi |
137 |
-} |
138 |
|
139 |
diff --git a/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild |
140 |
deleted file mode 100644 |
141 |
index 012e476..00000000 |
142 |
--- a/app-eselect/eselect-php/eselect-php-0.8.2-r1.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,58 +0,0 @@ |
145 |
-# Copyright 1999-2016 Gentoo Foundation |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
-# $Id$ |
148 |
- |
149 |
-EAPI=5 |
150 |
- |
151 |
-inherit depend.apache systemd |
152 |
- |
153 |
-DESCRIPTION="PHP eselect module" |
154 |
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" |
155 |
-SRC_URI=" |
156 |
- https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz |
157 |
- https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz |
158 |
-" |
159 |
- |
160 |
-LICENSE="GPL-2" |
161 |
-SLOT="0" |
162 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
163 |
-IUSE="fpm apache2" |
164 |
- |
165 |
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. |
166 |
-RDEPEND="app-admin/eselect |
167 |
- apache2? ( www-servers/apache[apache2_modules_dir] )" |
168 |
- |
169 |
-want_apache |
170 |
- |
171 |
-src_install() { |
172 |
- default |
173 |
- |
174 |
- if use apache2 ; then |
175 |
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" |
176 |
- doins "${FILESDIR}/70_mod_php.conf" |
177 |
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf |
178 |
- fi |
179 |
- |
180 |
- if use fpm ; then |
181 |
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm" |
182 |
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
183 |
- exeinto /usr/libexec |
184 |
- doexe "${FILESDIR}/php-fpm-launcher" |
185 |
- fi |
186 |
-} |
187 |
- |
188 |
-pkg_postinst() { |
189 |
- if use apache2 ; then |
190 |
- elog |
191 |
- elog "If you are upgrading, be warned that our mod_php configuration" |
192 |
- elog "file has changed! You should now define -DPHP for the apache2" |
193 |
- elog "daemon, and inspect the new 70_mod_php.conf which has been" |
194 |
- elog "installed. Module loading involves eselect as of this version." |
195 |
- elog |
196 |
- elog "You must run eselect at least once to choose your apache2 target" |
197 |
- elog "before the new configuration will work. Afterwards, and after you" |
198 |
- elog "have reviewed your new configuration, you are advised to remove" |
199 |
- elog "the obsolete 70_mod_php5.conf file." |
200 |
- elog |
201 |
- fi |
202 |
-} |
203 |
|
204 |
diff --git a/app-eselect/eselect-php/eselect-php-0.8.5.ebuild b/app-eselect/eselect-php/eselect-php-0.8.5.ebuild |
205 |
deleted file mode 100644 |
206 |
index 012e476..00000000 |
207 |
--- a/app-eselect/eselect-php/eselect-php-0.8.5.ebuild |
208 |
+++ /dev/null |
209 |
@@ -1,58 +0,0 @@ |
210 |
-# Copyright 1999-2016 Gentoo Foundation |
211 |
-# Distributed under the terms of the GNU General Public License v2 |
212 |
-# $Id$ |
213 |
- |
214 |
-EAPI=5 |
215 |
- |
216 |
-inherit depend.apache systemd |
217 |
- |
218 |
-DESCRIPTION="PHP eselect module" |
219 |
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" |
220 |
-SRC_URI=" |
221 |
- https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz |
222 |
- https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz |
223 |
-" |
224 |
- |
225 |
-LICENSE="GPL-2" |
226 |
-SLOT="0" |
227 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
228 |
-IUSE="fpm apache2" |
229 |
- |
230 |
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. |
231 |
-RDEPEND="app-admin/eselect |
232 |
- apache2? ( www-servers/apache[apache2_modules_dir] )" |
233 |
- |
234 |
-want_apache |
235 |
- |
236 |
-src_install() { |
237 |
- default |
238 |
- |
239 |
- if use apache2 ; then |
240 |
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" |
241 |
- doins "${FILESDIR}/70_mod_php.conf" |
242 |
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf |
243 |
- fi |
244 |
- |
245 |
- if use fpm ; then |
246 |
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm" |
247 |
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
248 |
- exeinto /usr/libexec |
249 |
- doexe "${FILESDIR}/php-fpm-launcher" |
250 |
- fi |
251 |
-} |
252 |
- |
253 |
-pkg_postinst() { |
254 |
- if use apache2 ; then |
255 |
- elog |
256 |
- elog "If you are upgrading, be warned that our mod_php configuration" |
257 |
- elog "file has changed! You should now define -DPHP for the apache2" |
258 |
- elog "daemon, and inspect the new 70_mod_php.conf which has been" |
259 |
- elog "installed. Module loading involves eselect as of this version." |
260 |
- elog |
261 |
- elog "You must run eselect at least once to choose your apache2 target" |
262 |
- elog "before the new configuration will work. Afterwards, and after you" |
263 |
- elog "have reviewed your new configuration, you are advised to remove" |
264 |
- elog "the obsolete 70_mod_php5.conf file." |
265 |
- elog |
266 |
- fi |
267 |
-} |
268 |
|
269 |
diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild |
270 |
deleted file mode 100644 |
271 |
index 9d0ddde..00000000 |
272 |
--- a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild |
273 |
+++ /dev/null |
274 |
@@ -1,66 +0,0 @@ |
275 |
-# Copyright 1999-2016 Gentoo Foundation |
276 |
-# Distributed under the terms of the GNU General Public License v2 |
277 |
-# $Id$ |
278 |
- |
279 |
-EAPI=6 |
280 |
- |
281 |
-inherit depend.apache systemd |
282 |
- |
283 |
-DESCRIPTION="PHP eselect module" |
284 |
-HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" |
285 |
-SRC_URI=" |
286 |
- https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz |
287 |
- https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz |
288 |
-" |
289 |
- |
290 |
-LICENSE="GPL-2" |
291 |
-SLOT="0" |
292 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
293 |
-IUSE="fpm apache2" |
294 |
- |
295 |
-# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. |
296 |
-RDEPEND="app-admin/eselect |
297 |
- apache2? ( www-servers/apache[apache2_modules_dir] )" |
298 |
- |
299 |
-want_apache |
300 |
- |
301 |
-src_configure(){ |
302 |
- # We expect localstatedir to be "var"ish, not "var/lib"ish, because |
303 |
- # that's what PHP upstream expects. See for example the FPM |
304 |
- # configuration where they put logs in @localstatedir@/log. |
305 |
- econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) |
306 |
-} |
307 |
- |
308 |
-src_install() { |
309 |
- default |
310 |
- |
311 |
- # After a while, this can go, along with the want_apache call and |
312 |
- # depend.apache eclass. |
313 |
- if use apache2 ; then |
314 |
- insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" |
315 |
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf |
316 |
- fi |
317 |
- |
318 |
- if use fpm ; then |
319 |
- newinitd "${FILESDIR}/php-fpm.init-r4" "php-fpm" |
320 |
- systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
321 |
- exeinto /usr/libexec |
322 |
- doexe "${FILESDIR}/php-fpm-launcher" |
323 |
- fi |
324 |
-} |
325 |
- |
326 |
-pkg_postinst() { |
327 |
- if use apache2 ; then |
328 |
- elog |
329 |
- elog "If you are upgrading, be warned that our mod_php configuration" |
330 |
- elog "file has changed! You should now define -DPHP for the apache2" |
331 |
- elog "daemon, and inspect the new 70_mod_php.conf which has been" |
332 |
- elog "installed. Module loading involves eselect as of this version." |
333 |
- elog |
334 |
- elog "You must run eselect at least once to choose your apache2 target" |
335 |
- elog "before the new configuration will work. Afterwards, and after you" |
336 |
- elog "have reviewed your new configuration, you are advised to remove" |
337 |
- elog "the obsolete 70_mod_php5.conf file." |
338 |
- elog |
339 |
- fi |
340 |
-} |
341 |
|
342 |
diff --git a/app-eselect/eselect-php/files/70_mod_php.conf b/app-eselect/eselect-php/files/70_mod_php.conf |
343 |
deleted file mode 100644 |
344 |
index cf996fa..00000000 |
345 |
--- a/app-eselect/eselect-php/files/70_mod_php.conf |
346 |
+++ /dev/null |
347 |
@@ -1,26 +0,0 @@ |
348 |
-<IfDefine PHP> |
349 |
- # The mod_php.so symlink is controlled by |
350 |
- # eselect-php. However, the module name changed from |
351 |
- # php5_module to php7_module so we can't blindly load whatever |
352 |
- # is there. Instead we let eselect-php manage a small |
353 |
- # configuration file that loads the appropriate module. |
354 |
- # |
355 |
- # This is relative to ServerRoot (see httpd.conf). |
356 |
- Include ../../../var/lib/eselect-php/mod_php.conf |
357 |
- |
358 |
- # Tell apache that mod_php should handle PHP files. |
359 |
- # |
360 |
- # NOTE: Avoiding AddHandler/AddType for security (bug |
361 |
- # #538822). Please read the related news item! |
362 |
- <FilesMatch "\.(php|php[57]|phtml)$"> |
363 |
- SetHandler application/x-httpd-php |
364 |
- </FilesMatch> |
365 |
- |
366 |
- # PHP source files which are meant to be displayed as |
367 |
- # syntax-highlighted source code. |
368 |
- <FilesMatch "\.phps$"> |
369 |
- SetHandler application/x-httpd-php-source |
370 |
- </FilesMatch> |
371 |
- |
372 |
- DirectoryIndex index.php index.phtml |
373 |
-</IfDefine> |
374 |
|
375 |
diff --git a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 |
376 |
deleted file mode 100644 |
377 |
index 05deeb6..00000000 |
378 |
--- a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2-r1 |
379 |
+++ /dev/null |
380 |
@@ -1,18 +0,0 @@ |
381 |
-<IfDefine PHP5> |
382 |
- # Load the module first |
383 |
- <IfModule !mod_php5.c> |
384 |
- LoadModule php5_module modules/libphp5.so |
385 |
- </IfModule> |
386 |
- |
387 |
- # Set it to handle the files |
388 |
- # NOTE: Avoiding AddHandler/AddType for security (bug #538822) |
389 |
- # NOTE: Please read the related news item! |
390 |
- <FilesMatch "\.(php|php5|phtml)$"> |
391 |
- SetHandler application/x-httpd-php |
392 |
- </FilesMatch> |
393 |
- <FilesMatch "\.phps$"> |
394 |
- SetHandler application/x-httpd-php-source |
395 |
- </FilesMatch> |
396 |
- |
397 |
- DirectoryIndex index.php index.phtml |
398 |
-</IfDefine> |
399 |
|
400 |
diff --git a/app-eselect/eselect-php/files/php-fpm-r1.init b/app-eselect/eselect-php/files/php-fpm-r1.init |
401 |
deleted file mode 100644 |
402 |
index 54c8e98..00000000 |
403 |
--- a/app-eselect/eselect-php/files/php-fpm-r1.init |
404 |
+++ /dev/null |
405 |
@@ -1,50 +0,0 @@ |
406 |
-#!/sbin/openrc-run |
407 |
- |
408 |
-set_phpvars() { |
409 |
- PHPSLOT=${SVCNAME#php-fpm-} |
410 |
- PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid" |
411 |
- if [ ${PHPSLOT} = 'php-fpm' ] ; then |
412 |
- PHPSLOT="$(eselect php show fpm)" |
413 |
- PHP_FPM_PID="/run/php-fpm.pid" |
414 |
- fi |
415 |
- |
416 |
- PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" |
417 |
-} |
418 |
- |
419 |
-extra_commands="depend" |
420 |
-extra_started_commands="reload" |
421 |
- |
422 |
-depend() { |
423 |
- need net |
424 |
- use apache2 lighttpd nginx |
425 |
-} |
426 |
- |
427 |
-start() { |
428 |
- ebegin "Starting PHP FastCGI Process Manager" |
429 |
- set_phpvars |
430 |
- start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \ |
431 |
- /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}" |
432 |
- local i=0 |
433 |
- local timeout=5 |
434 |
- while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do |
435 |
- sleep 1 |
436 |
- i=$(($i + 1)) |
437 |
- done |
438 |
- |
439 |
- [ $timeout -gt $i ] |
440 |
- eend $? |
441 |
-} |
442 |
- |
443 |
-stop() { |
444 |
- ebegin "Stopping PHP FastCGI Process Manager" |
445 |
- set_phpvars |
446 |
- start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID} |
447 |
- eend $? |
448 |
-} |
449 |
- |
450 |
-reload() { |
451 |
- ebegin "Reloading PHP FastCGI Process Manager" |
452 |
- set_phpvars |
453 |
- [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID}) |
454 |
- eend $? |
455 |
-} |
456 |
|
457 |
diff --git a/app-eselect/eselect-php/files/php-fpm.init-r4 b/app-eselect/eselect-php/files/php-fpm.init-r4 |
458 |
deleted file mode 100644 |
459 |
index 6502ab9..00000000 |
460 |
--- a/app-eselect/eselect-php/files/php-fpm.init-r4 |
461 |
+++ /dev/null |
462 |
@@ -1,70 +0,0 @@ |
463 |
-#!/sbin/openrc-run |
464 |
- |
465 |
-extra_started_commands="reload" |
466 |
-extra_commands="configtest" |
467 |
- |
468 |
-set_phpvars() { |
469 |
- PHPSLOT="${SVCNAME#php-fpm-}" |
470 |
- PHP_FPM_PID="/run/php-fpm-${PHPSLOT}.pid" |
471 |
- if [ "${PHPSLOT}" = "php-fpm" ] ; then |
472 |
- PHPSLOT="$(eselect php show fpm)" |
473 |
- PHP_FPM_PID="/run/php-fpm.pid" |
474 |
- fi |
475 |
- |
476 |
- PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" |
477 |
- PHP_FPM_BIN="/usr/lib/${PHPSLOT}/bin/php-fpm" |
478 |
-} |
479 |
- |
480 |
-start() { |
481 |
- # If configtest fails, we don't have to sit around for five |
482 |
- # seconds waiting for a pid to show up. |
483 |
- configtest || return $? |
484 |
- ebegin "Starting PHP FastCGI Process Manager" |
485 |
- set_phpvars |
486 |
- start-stop-daemon --start --pidfile "${PHP_FPM_PID}" \ |
487 |
- --exec "${PHP_FPM_BIN}" \ |
488 |
- -- \ |
489 |
- --fpm-config "${PHP_FPM_CONF}" \ |
490 |
- --pid "${PHP_FPM_PID}" |
491 |
- local i=0 |
492 |
- local timeout=5 |
493 |
- while [ ! -f "${PHP_FPM_PID}" ] && [ $i -le $timeout ]; do |
494 |
- sleep 1 |
495 |
- i=$(($i + 1)) |
496 |
- done |
497 |
- |
498 |
- [ $timeout -gt $i ] |
499 |
- eend $? |
500 |
-} |
501 |
- |
502 |
-stop() { |
503 |
- ebegin "Stopping PHP FastCGI Process Manager" |
504 |
- set_phpvars |
505 |
- start-stop-daemon --signal QUIT \ |
506 |
- --stop \ |
507 |
- --exec "${PHP_FPM_BIN}" \ |
508 |
- --pidfile "${PHP_FPM_PID}" |
509 |
- eend $? |
510 |
-} |
511 |
- |
512 |
-reload() { |
513 |
- configtest || return $? |
514 |
- ebegin "Reloading PHP FastCGI Process Manager" |
515 |
- set_phpvars |
516 |
- [ -f "${PHP_FPM_PID}" ] && kill -USR2 $(cat "${PHP_FPM_PID}") |
517 |
- eend $? |
518 |
-} |
519 |
- |
520 |
-configtest() { |
521 |
- ebegin "Testing PHP FastCGI Process Manager configuration" |
522 |
- set_phpvars |
523 |
- # Hide the "test is successful" message (which goes to stderr) if |
524 |
- # the test passed, but show the entire output if the test failed |
525 |
- # because it may contain hints about the problem. |
526 |
- OUTPUT=$( "${PHP_FPM_BIN}" --fpm-config "${PHP_FPM_CONF}" --test 2>&1 ) |
527 |
- |
528 |
- # Save this so `echo` doesn't clobber it. |
529 |
- local exit_code=$? |
530 |
- [ $exit_code -ne 0 ] && echo "${OUTPUT}" >&2 |
531 |
- eend $exit_code |
532 |
-} |
533 |
|
534 |
diff --git a/app-eselect/eselect-php/files/php-fpm_at.service b/app-eselect/eselect-php/files/php-fpm_at.service |
535 |
deleted file mode 100644 |
536 |
index 152c1ab..00000000 |
537 |
--- a/app-eselect/eselect-php/files/php-fpm_at.service |
538 |
+++ /dev/null |
539 |
@@ -1,14 +0,0 @@ |
540 |
-[Unit] |
541 |
-Description=The PHP FastCGI Process Manager |
542 |
-After=network.target |
543 |
- |
544 |
-[Service] |
545 |
-Type=notify |
546 |
-PIDFile=/run/php-fpm/php-fpm-%I.pid |
547 |
-ExecStart=/usr/libexec/php-fpm-launcher php%I -y /etc/php/fpm-php%I/php-fpm.conf --nodaemonize |
548 |
-ExecReload=/bin/kill -USR2 $MAINPID |
549 |
-PrivateTmp=true |
550 |
- |
551 |
-[Install] |
552 |
-WantedBy=multi-user.target |
553 |
- |