summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames An2017-02-13 04:59:47 -0500
committerJames An2017-02-13 04:59:47 -0500
commit223ff844a8cde6c374ae0a14c86dd0348474df2a (patch)
treea09d0dde004d0cb213d168641ff4e3cf1ba16910
parentf6728c2d4c6d90524b545af3127b47eae6b4d02e (diff)
downloadaur-223ff844a8cde6c374ae0a14c86dd0348474df2a.tar.gz
Fixed PHP configuration so Aegir-specific directives do not affect other unrelated PHP processes not using the Aegir PHP-FPM pool.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
-rw-r--r--php-fpm.conf4
-rw-r--r--php.ini4
4 files changed, 6 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d1358b1e4b..eee63327284 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = aegir
pkgdesc = Configuration for a dedicated Aegir server to host Drupal sites.
pkgver = 7.x_3.9
- pkgrel = 3
+ pkgrel = 4
url = http://aegirproject.org
install = aegir.install
arch = any
@@ -27,7 +27,6 @@ pkgbase = aegir
source = nginx.systemd.conf
source = php-fpm.conf
source = php-fpm.systemd.conf
- source = php.ini
source = sudoers
md5sums = 81c8f6285f3f17184dc8655e2942f3fc
md5sums = 95bce00a6c0ac2a0b51642449554105b
diff --git a/PKGBUILD b/PKGBUILD
index 89afd4ffbce..df59cc387cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=aegir
pkgver=7.x_3.9
-pkgrel=3
+pkgrel=4
pkgdesc="Configuration for a dedicated Aegir server to host Drupal sites."
arch=('any')
url='http://aegirproject.org'
@@ -33,7 +33,6 @@ source=("$pkgname.service"
'nginx.systemd.conf'
'php-fpm.conf'
'php-fpm.systemd.conf'
- 'php.ini'
'sudoers'
)
md5sums=('81c8f6285f3f17184dc8655e2942f3fc'
@@ -51,7 +50,6 @@ package() {
install -dm750 "$pkgdir/etc/sudoers.d"
install -Dm644 msmtprc "$pkgdir/etc/msmtprc.$pkgname"
install -Dm644 nginx.conf "$pkgdir/etc/nginx/$pkgname.conf"
- install -Dm644 php.ini "$pkgdir/etc/php/conf.d/$pkgname.ini"
install -Dm644 php-fpm.conf "$pkgdir/etc/php/fpm.d/$pkgname.conf"
install -Dm400 sudoers "$pkgdir/etc/sudoers.d/$pkgname"
install -Dm644 --owner=http --group=http <( ) "$pkgdir/var/spool/cron/$pkgname"
diff --git a/php-fpm.conf b/php-fpm.conf
index 9932b0bfcb3..d63cef2ab43 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -18,3 +18,7 @@ pm.max_children = 5
pm.start_servers = 2
pm.min_spare_servers = 1
pm.max_spare_servers = 3
+
+php_admin_flag[allow_url_fopen] = off
+php_admin_flag[expose_php] = off
+php_admin_value[error_reporting] = E_ALL
diff --git a/php.ini b/php.ini
deleted file mode 100644
index 5bb3acdc081..00000000000
--- a/php.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-; Recommended settings.
-allow_url_fopen = Off
-error_reporting = E_ALL
-expose_php = Off