From 65dc92232e6c547a42aa1dc1ec4d98c261fc3ae4 Mon Sep 17 00:00:00 2001 From: earnolmartin Date: Thu, 24 May 2018 17:46:43 -0600 Subject: [PATCH] Match nginx PHP Matching & nginx fixes --- ehcp/apache_subdomain_template | 2 +- ehcp/apachetemplate | 8 ++++---- ehcp/apachetemplate_ehcp_panel | 2 +- ehcp/apachetemplate_ipbased | 8 ++++---- ehcp/apachetemplate_passivedomains | 2 +- ehcp/etc/apache2/apache_subdomain_template | 2 +- .../apache2/apache_subdomain_template_ipbased | 2 +- ehcp/etc/apache2/apachetemplate | 8 ++++---- ehcp/etc/apache2/apachetemplate_ehcp_panel | 2 +- ehcp/etc/apache2/apachetemplate_ipbased | 8 ++++---- ehcp/etc/apache2/apachetemplate_passivedomains | 2 +- ehcp/etc/apache2/default | 2 +- .../apache2_ssl/fork/apache_subdomain_template | 4 ++-- ehcp/etc/apache2_ssl/fork/apachetemplate | 16 ++++++++-------- .../apache2_ssl/fork/apachetemplate_ehcp_panel | 2 +- ehcp/etc/apache2_ssl/fork/apachetemplate_ipbased | 16 ++++++++-------- .../fork/apachetemplate_passivedomains | 4 ++-- ehcp/etc/apache2_ssl/fork/default | 4 ++-- .../fork/apache_subdomain_template | 2 +- ehcp/etc/apache2_sslonly/fork/apachetemplate | 8 ++++---- .../fork/apachetemplate_ehcp_panel | 2 +- .../apache2_sslonly/fork/apachetemplate_ipbased | 8 ++++---- .../fork/apachetemplate_passivedomains | 2 +- ehcp/etc/apache2_sslonly/fork/default | 2 +- ehcp/etc/nginx/nginx.conf | 1 + ehcp/etc/nginx_nonssl/nginx.conf | 1 + ehcp/etc/nginx_ssl/nginx.conf | 1 + ehcp/etc/nginx_sslonly/nginx.conf | 1 + 28 files changed, 63 insertions(+), 59 deletions(-) diff --git a/ehcp/apache_subdomain_template b/ehcp/apache_subdomain_template index bdab5e7..5b91e9e 100755 --- a/ehcp/apache_subdomain_template +++ b/ehcp/apache_subdomain_template @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" {customsubdomainhttp} diff --git a/ehcp/apachetemplate b/ehcp/apachetemplate index 0d051b5..ae6e354 100755 --- a/ehcp/apachetemplate +++ b/ehcp/apachetemplate @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -34,7 +34,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -51,7 +51,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -92,7 +92,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/apachetemplate_ehcp_panel b/ehcp/apachetemplate_ehcp_panel index bfbbe18..22ad4a9 100644 --- a/ehcp/apachetemplate_ehcp_panel +++ b/ehcp/apachetemplate_ehcp_panel @@ -9,7 +9,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" diff --git a/ehcp/apachetemplate_ipbased b/ehcp/apachetemplate_ipbased index f60d357..becbc78 100755 --- a/ehcp/apachetemplate_ipbased +++ b/ehcp/apachetemplate_ipbased @@ -15,7 +15,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -33,7 +33,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -49,7 +49,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -91,7 +91,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/apachetemplate_passivedomains b/ehcp/apachetemplate_passivedomains index 06fe1ad..e3bd3d5 100755 --- a/ehcp/apachetemplate_passivedomains +++ b/ehcp/apachetemplate_passivedomains @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" diff --git a/ehcp/etc/apache2/apache_subdomain_template b/ehcp/etc/apache2/apache_subdomain_template index 8bc3a61..1a0a30f 100755 --- a/ehcp/etc/apache2/apache_subdomain_template +++ b/ehcp/etc/apache2/apache_subdomain_template @@ -11,7 +11,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" {customsubdomainhttp} diff --git a/ehcp/etc/apache2/apache_subdomain_template_ipbased b/ehcp/etc/apache2/apache_subdomain_template_ipbased index 1bcb61d..a658fe6 100755 --- a/ehcp/etc/apache2/apache_subdomain_template_ipbased +++ b/ehcp/etc/apache2/apache_subdomain_template_ipbased @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" {customsubdomainhttp} diff --git a/ehcp/etc/apache2/apachetemplate b/ehcp/etc/apache2/apachetemplate index 39dcdb8..abbe3a5 100755 --- a/ehcp/etc/apache2/apachetemplate +++ b/ehcp/etc/apache2/apachetemplate @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -34,7 +34,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -71,7 +71,7 @@ Deny from all - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -94,7 +94,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2/apachetemplate_ehcp_panel b/ehcp/etc/apache2/apachetemplate_ehcp_panel index 764968f..8402853 100755 --- a/ehcp/etc/apache2/apachetemplate_ehcp_panel +++ b/ehcp/etc/apache2/apachetemplate_ehcp_panel @@ -29,7 +29,7 @@ Deny from all - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" diff --git a/ehcp/etc/apache2/apachetemplate_ipbased b/ehcp/etc/apache2/apachetemplate_ipbased index ddff06a..e65320e 100755 --- a/ehcp/etc/apache2/apachetemplate_ipbased +++ b/ehcp/etc/apache2/apachetemplate_ipbased @@ -15,7 +15,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -33,7 +33,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -50,7 +50,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -92,7 +92,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2/apachetemplate_passivedomains b/ehcp/etc/apache2/apachetemplate_passivedomains index 1feafeb..4a85e32 100755 --- a/ehcp/etc/apache2/apachetemplate_passivedomains +++ b/ehcp/etc/apache2/apachetemplate_passivedomains @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" diff --git a/ehcp/etc/apache2/default b/ehcp/etc/apache2/default index 6fbdcfc..49430e9 100755 --- a/ehcp/etc/apache2/default +++ b/ehcp/etc/apache2/default @@ -34,7 +34,7 @@ ErrorLog /var/log/apache2/default.error.log CustomLog /var/log/apache2/default.access.log vhost_combined - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001/var/www/new/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001/var/www/new/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/var/www:/tmp:/usr/share:/etc/roundcube:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" diff --git a/ehcp/etc/apache2_ssl/fork/apache_subdomain_template b/ehcp/etc/apache2_ssl/fork/apache_subdomain_template index 4bd38c1..2521cee 100644 --- a/ehcp/etc/apache2_ssl/fork/apache_subdomain_template +++ b/ehcp/etc/apache2_ssl/fork/apache_subdomain_template @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" {customsubdomainhttp} @@ -37,7 +37,7 @@ SSLCertificateKeyFile {ssl_cert_key_path} {ssl_cert_chain_setting_with_path} - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" {customsubdomainhttp} diff --git a/ehcp/etc/apache2_ssl/fork/apachetemplate b/ehcp/etc/apache2_ssl/fork/apachetemplate index 0bca77f..1368cf2 100644 --- a/ehcp/etc/apache2_ssl/fork/apachetemplate +++ b/ehcp/etc/apache2_ssl/fork/apachetemplate @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -34,7 +34,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -51,7 +51,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -93,7 +93,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess @@ -121,7 +121,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" SSLEngine on @@ -144,7 +144,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" SSLEngine on @@ -166,7 +166,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -213,7 +213,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2_ssl/fork/apachetemplate_ehcp_panel b/ehcp/etc/apache2_ssl/fork/apachetemplate_ehcp_panel index b4cfd24..202fc8b 100755 --- a/ehcp/etc/apache2_ssl/fork/apachetemplate_ehcp_panel +++ b/ehcp/etc/apache2_ssl/fork/apachetemplate_ehcp_panel @@ -17,7 +17,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" diff --git a/ehcp/etc/apache2_ssl/fork/apachetemplate_ipbased b/ehcp/etc/apache2_ssl/fork/apachetemplate_ipbased index bb9872a..9201bcb 100644 --- a/ehcp/etc/apache2_ssl/fork/apachetemplate_ipbased +++ b/ehcp/etc/apache2_ssl/fork/apachetemplate_ipbased @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -34,7 +34,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" @@ -51,7 +51,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -94,7 +94,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess @@ -122,7 +122,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" SSLEngine on @@ -145,7 +145,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" SSLEngine on @@ -167,7 +167,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -215,7 +215,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2_ssl/fork/apachetemplate_passivedomains b/ehcp/etc/apache2_ssl/fork/apachetemplate_passivedomains index 270e98d..dc7fcf5 100644 --- a/ehcp/etc/apache2_ssl/fork/apachetemplate_passivedomains +++ b/ehcp/etc/apache2_ssl/fork/apachetemplate_passivedomains @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" @@ -27,7 +27,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" SSLEngine on diff --git a/ehcp/etc/apache2_ssl/fork/default b/ehcp/etc/apache2_ssl/fork/default index fa7c324..212b992 100644 --- a/ehcp/etc/apache2_ssl/fork/default +++ b/ehcp/etc/apache2_ssl/fork/default @@ -32,7 +32,7 @@ ErrorLog /var/log/apache2/default.error.log CustomLog /var/log/apache2/default.access.log vhost_combined - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001/var/www/new/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001/var/www/new/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/var/www:/tmp:/usr/share:/etc/roundcube:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" @@ -87,7 +87,7 @@ SSLCertificateFile /etc/ssl/certs/server.crt SSLCertificateKeyFile /etc/ssl/private/server.key - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001/var/www/new/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001/var/www/new/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/var/www:/tmp:/usr/share:/etc/roundcube:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" diff --git a/ehcp/etc/apache2_sslonly/fork/apache_subdomain_template b/ehcp/etc/apache2_sslonly/fork/apache_subdomain_template index c14bff1..ef9caa3 100644 --- a/ehcp/etc/apache2_sslonly/fork/apache_subdomain_template +++ b/ehcp/etc/apache2_sslonly/fork/apache_subdomain_template @@ -12,7 +12,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" SSLEngine on diff --git a/ehcp/etc/apache2_sslonly/fork/apachetemplate b/ehcp/etc/apache2_sslonly/fork/apachetemplate index 01afab3..f9293df 100644 --- a/ehcp/etc/apache2_sslonly/fork/apachetemplate +++ b/ehcp/etc/apache2_sslonly/fork/apachetemplate @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" SSLEngine on @@ -39,7 +39,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" SSLEngine on @@ -61,7 +61,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -107,7 +107,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2_sslonly/fork/apachetemplate_ehcp_panel b/ehcp/etc/apache2_sslonly/fork/apachetemplate_ehcp_panel index 7b9ad79..644cd1c 100755 --- a/ehcp/etc/apache2_sslonly/fork/apachetemplate_ehcp_panel +++ b/ehcp/etc/apache2_sslonly/fork/apachetemplate_ehcp_panel @@ -9,7 +9,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" diff --git a/ehcp/etc/apache2_sslonly/fork/apachetemplate_ipbased b/ehcp/etc/apache2_sslonly/fork/apachetemplate_ipbased index b17019a..2234bda 100644 --- a/ehcp/etc/apache2_sslonly/fork/apachetemplate_ipbased +++ b/ehcp/etc/apache2_sslonly/fork/apachetemplate_ipbased @@ -16,7 +16,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail:/tmp:/var/www/php_sessions:/usr/share:/etc/roundcube:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" SSLEngine on @@ -39,7 +39,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/webmail2/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}/webmail2; \n upload_tmp_dir={ehcpdir}/webmail2/data; \n session.save_path={ehcpdir}/webmail2/data;" SSLEngine on @@ -61,7 +61,7 @@ LogFormat "%v:%p %h %l %u %t \"%{Host}i\" \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined_host CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001{ehcpdir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={ehcpdir}:/usr/share/php:/usr/share/pear" @@ -108,7 +108,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/httpdocs/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" AccessFileName .htaccess diff --git a/ehcp/etc/apache2_sslonly/fork/apachetemplate_passivedomains b/ehcp/etc/apache2_sslonly/fork/apachetemplate_passivedomains index 1a70280..7fcbec1 100644 --- a/ehcp/etc/apache2_sslonly/fork/apachetemplate_passivedomains +++ b/ehcp/etc/apache2_sslonly/fork/apachetemplate_passivedomains @@ -13,7 +13,7 @@ CustomLog {homedir}/logs/access_log combined CustomLog /var/log/apache2/access_log_multi.log vhost_combined_host - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000{homedir}/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9000{homedir}/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir={homedir}:/usr/share/php:/usr/share/pear; \n upload_tmp_dir={homedir}/phptmpdir; \n session.save_path={homedir}/phptmpdir;" SSLEngine on diff --git a/ehcp/etc/apache2_sslonly/fork/default b/ehcp/etc/apache2_sslonly/fork/default index 2f9b66f..f56cbf0 100644 --- a/ehcp/etc/apache2_sslonly/fork/default +++ b/ehcp/etc/apache2_sslonly/fork/default @@ -58,7 +58,7 @@ SSLCertificateFile /etc/ssl/certs/server.crt SSLCertificateKeyFile /etc/ssl/private/server.key - ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9001/var/www/new/$1 + ProxyPassMatch ^(.*\.php)$ fcgi://127.0.0.1:9001/var/www/new/$1 ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/var/www:/tmp:/usr/share:/etc/roundcube:/etc/phpmyadmin:/var/lib/phpmyadmin:/var/lib/roundcube:/var/log/roundcube; \n upload_tmp_dir=/tmp; \n session.save_path=/var/www/php_sessions;" diff --git a/ehcp/etc/nginx/nginx.conf b/ehcp/etc/nginx/nginx.conf index 8088ad6..cffca4f 100755 --- a/ehcp/etc/nginx/nginx.conf +++ b/ehcp/etc/nginx/nginx.conf @@ -14,6 +14,7 @@ events { http { server_names_hash_bucket_size 4096; + types_hash_max_size 4096; limit_req_zone $binary_remote_addr zone=one:20m rate=10r/s; include /etc/nginx/mime.types; diff --git a/ehcp/etc/nginx_nonssl/nginx.conf b/ehcp/etc/nginx_nonssl/nginx.conf index 8088ad6..cffca4f 100755 --- a/ehcp/etc/nginx_nonssl/nginx.conf +++ b/ehcp/etc/nginx_nonssl/nginx.conf @@ -14,6 +14,7 @@ events { http { server_names_hash_bucket_size 4096; + types_hash_max_size 4096; limit_req_zone $binary_remote_addr zone=one:20m rate=10r/s; include /etc/nginx/mime.types; diff --git a/ehcp/etc/nginx_ssl/nginx.conf b/ehcp/etc/nginx_ssl/nginx.conf index bb0959a..cf8999a 100755 --- a/ehcp/etc/nginx_ssl/nginx.conf +++ b/ehcp/etc/nginx_ssl/nginx.conf @@ -13,6 +13,7 @@ events { http { server_names_hash_bucket_size 4096; + types_hash_max_size 4096; limit_req_zone $binary_remote_addr zone=one:20m rate=10r/s; include /etc/nginx/mime.types; diff --git a/ehcp/etc/nginx_sslonly/nginx.conf b/ehcp/etc/nginx_sslonly/nginx.conf index 138b8a3..0063ad7 100755 --- a/ehcp/etc/nginx_sslonly/nginx.conf +++ b/ehcp/etc/nginx_sslonly/nginx.conf @@ -13,6 +13,7 @@ events { http { server_names_hash_bucket_size 4096; + types_hash_max_size 4096; limit_req_zone $binary_remote_addr zone=one:20m rate=10r/s; include /etc/nginx/mime.types;