From 759213f8b9f906944138a4bf9646885c3304d338 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 2 Dec 2010 12:51:14 +0000 Subject: [PATCH] add extra configuration for Apache + PHP-FPM, fixes #482 --- lib/configfiles/gentoo.inc.php | 6 ++++++ lib/configfiles/hardy.inc.php | 6 ++++++ lib/configfiles/lenny.inc.php | 6 ++++++ lib/configfiles/lucid.inc.php | 6 ++++++ .../apache2/etc_apache2_mods-enabled_fastcgi.conf | 11 +++++++++++ .../apache2/etc_apache2_modules.d_70_fastcgi.conf | 11 +++++++++++ .../apache2/etc_apache2_mods-enabled_fastcgi.conf | 11 +++++++++++ .../apache2/etc_apache2_mods-enabled_fastcgi.conf | 11 +++++++++++ 8 files changed, 68 insertions(+) create mode 100644 templates/misc/configfiles/debian_lenny/apache2/etc_apache2_mods-enabled_fastcgi.conf create mode 100644 templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf create mode 100644 templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf create mode 100644 templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index c12934c8..9aa6e86b 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -39,6 +39,12 @@ return Array( 'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'], 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'] ), + 'files' => ((int)$settings['phpfpm']['enabled'] == 1) ? + Array( + 'etc_apache2_modules.d_70_fastcgi.conf' => '/etc/apache2/modules.d/70_fastcgi.conf' + ) + : + null, 'restart' => Array( 'rc-update add apache2 default', '/etc/init.d/apache2 restart' diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index 42db6d22..77c7afcf 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -34,6 +34,12 @@ return Array( 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'], 'a2dismod userdir' ), + 'files' => ((int)$settings['phpfpm']['enabled'] == 1) ? + Array( + 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' + ) + : + null, 'restart' => Array( '/etc/init.d/apache2 restart' ) diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php index a8e1c236..aca5e008 100644 --- a/lib/configfiles/lenny.inc.php +++ b/lib/configfiles/lenny.inc.php @@ -34,6 +34,12 @@ return Array( 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'], 'a2dismod userdir' ), + 'files' => ((int)$settings['phpfpm']['enabled'] == 1) ? + Array( + 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' + ) + : + null, 'restart' => Array( '/etc/init.d/apache2 restart' ), diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php index c2bed900..7f86c8f4 100644 --- a/lib/configfiles/lucid.inc.php +++ b/lib/configfiles/lucid.inc.php @@ -34,6 +34,12 @@ return Array( 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'], 'a2dismod userdir' ), + 'files' => ((int)$settings['phpfpm']['enabled'] == 1) ? + Array( + 'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf' + ) + : + null, 'restart' => Array( '/etc/init.d/apache2 restart' ), diff --git a/templates/misc/configfiles/debian_lenny/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/debian_lenny/apache2/etc_apache2_mods-enabled_fastcgi.conf new file mode 100644 index 00000000..704727c5 --- /dev/null +++ b/templates/misc/configfiles/debian_lenny/apache2/etc_apache2_mods-enabled_fastcgi.conf @@ -0,0 +1,11 @@ + + FastCgiWrapper /usr/lib/apache2/suexec + FastCgiIpcDir /var/run/apache2/ + + + Order Deny,Allow + Deny from All + # Prevent accessing this path directly + Allow from env=REDIRECT_STATUS + + diff --git a/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf b/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf new file mode 100644 index 00000000..a46de602 --- /dev/null +++ b/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf @@ -0,0 +1,11 @@ + + FastCgiWrapper /usr/sbin/suexec + FastCgiIpcDir /var/run/apache2/ + + + Order Deny,Allow + Deny from All + # Prevent accessing this path directly + Allow from env=REDIRECT_STATUS + + diff --git a/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf new file mode 100644 index 00000000..704727c5 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/apache2/etc_apache2_mods-enabled_fastcgi.conf @@ -0,0 +1,11 @@ + + FastCgiWrapper /usr/lib/apache2/suexec + FastCgiIpcDir /var/run/apache2/ + + + Order Deny,Allow + Deny from All + # Prevent accessing this path directly + Allow from env=REDIRECT_STATUS + + diff --git a/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf b/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf new file mode 100644 index 00000000..704727c5 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_lucid/apache2/etc_apache2_mods-enabled_fastcgi.conf @@ -0,0 +1,11 @@ + + FastCgiWrapper /usr/lib/apache2/suexec + FastCgiIpcDir /var/run/apache2/ + + + Order Deny,Allow + Deny from All + # Prevent accessing this path directly + Allow from env=REDIRECT_STATUS + +