diff --git a/install/dist/tpl/gentoo/apache_apps.vhost.master b/install/dist/tpl/gentoo/apache_apps.vhost.master
index ac29f81bb3ba72fbc1e06d075e5c039151e5635a..aff93d06ffd9d0c5c3e8ff5e74005cc2777c7711 100644
--- a/install/dist/tpl/gentoo/apache_apps.vhost.master
+++ b/install/dist/tpl/gentoo/apache_apps.vhost.master
@@ -21,8 +21,7 @@
SetHandler fcgid-script
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
- Order allow,deny
- Allow from all
+ Require all granted
DirectoryIndex index.php
@@ -33,8 +32,7 @@
Options +FollowSymLinks
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
diff --git a/install/dist/tpl/gentoo/apache_ispconfig.conf.master b/install/dist/tpl/gentoo/apache_ispconfig.conf.master
index 799a39601ab99c0362079627ffc90444cbf37459..2cd17d3f1890e532252098a89244b44d7f5a7f52 100644
--- a/install/dist/tpl/gentoo/apache_ispconfig.conf.master
+++ b/install/dist/tpl/gentoo/apache_ispconfig.conf.master
@@ -9,13 +9,11 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
AllowOverride None
- Order Deny,Allow
- Deny from all
+ Require all denied
# allow path to awstats and alias for awstats icons
- Order allow,deny
- Allow from all
+ Require all granted
Alias /awstats/icon "/usr/share/awstats/htdocs/icon"
diff --git a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
index f4f08d2bb6e878d742ae023de172f9d664b189b1..fb1b9d2a1ffd2d359fd108f96b19f0df34768f54 100644
--- a/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
+++ b/install/dist/tpl/gentoo/apache_ispconfig.vhost.master
@@ -20,8 +20,7 @@ NameVirtualHost *:{vhost_port}
SetHandler fcgid-script
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
- Order allow,deny
- Allow from all
+ Require all granted
DirectoryIndex index.php
@@ -32,8 +31,7 @@ NameVirtualHost *:{vhost_port}
Options +FollowSymLinks
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
php_value magic_quotes_gpc 0
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index b2d9e66f76deec5cc3697c77e7f1c20ac04b2769..cb31fb28e62269572da9d81e1946922adc1f7deb 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -970,20 +970,20 @@ function getapacheversion($get_minor = false) {
elseif(is_installed('apachectl')) $cmd = 'apachectl -v';
else {
ilog("Could not check apache version, apachectl not found.");
- return '2.2';
+ return '2.4';
}
exec($cmd, $output, $return_var);
if($return_var != 0 || !$output[0]) {
ilog("Could not check apache version, apachectl did not return any data.");
- return '2.2';
+ return '2.4';
}
if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : '');
} else {
ilog("Could not check apache version, did not find version string in apachectl output.");
- return '2.2';
+ return '2.4';
}
}
diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master
index ee1b693097a200505f42c7a7da3313b134d016b9..6ffb1df8a1479eeb79efe13fbda2b6c87f0aac00 100644
--- a/install/tpl/apache_apps.vhost.master
+++ b/install/tpl/apache_apps.vhost.master
@@ -25,12 +25,7 @@
Options FollowSymLinks
AllowOverride None
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -40,12 +35,7 @@
Options FollowSymLinks
AllowOverride None
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -59,12 +49,7 @@
SetHandler fcgid-script
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
-
Require all granted
-
- Order allow,deny
- Allow from all
-
diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 333450726ba8f407b76d1e214bae6e80f99c78fa..0f4a77cd9ae3eec26b11c59002349d4f166270de 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -27,131 +27,63 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
# Do not allow access to the root file system of the server for security reasons
Options -Indexes
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
# Except of the following directories that contain website scripts
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# Allow access to mailman on OpenSuSE
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
Options +FollowSymLinks
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# allow path to awstats and alias for awstats icons
-
Require all granted
-
- Order allow,deny
- Allow from all
-
Alias /awstats-icon "/usr/share/awstats/icon"
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
-
Require all granted
-
- Order allow,deny
- Allow from all
-
AssignUserId www-data www-data
-
-
-NameVirtualHost *:80
-NameVirtualHost *:443
-
-NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
-
-
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index eab55f3226f6fb2b16f019f40db2cf2608de4f30..d77060d3378ba0407b5cc5be2b5e95da28abd526 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -33,12 +33,7 @@
SetHandler fcgid-script
FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
-
Require all granted
-
- Order allow,deny
- Allow from all
-
IPCCommTimeout 7200
MaxRequestLen 15728640
@@ -52,12 +47,7 @@
# php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
Options +FollowSymLinks
AllowOverride None
-
Require all granted
-
- Order allow,deny
- Allow from all
-
php_value magic_quotes_gpc 0
@@ -121,20 +111,10 @@
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index e6c44613eef62d5d843ff82d1a96ba4a78716005..bf3306fa93f14fb8fc1e08dd0e0dd5998e3e6b8d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -134,7 +134,6 @@ fastcgi_phpini_path=/etc/php5/cgi/
fastcgi_children=8
fastcgi_max_requests=5000
fastcgi_bin=/usr/bin/php-cgi
-fastcgi_config_syntax=2
[jailkit]
jailkit_chroot_home=/home/[username]
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index ceb7626f534563c58e000ce5013cfcaf96349758..21b77fc0f9922a8ab8261931d394f0cb749e32bc 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -1602,15 +1602,7 @@ $form["tabs"]['fastcgi'] = array(
'value' => '',
'width' => '40',
'maxlength' => '255'
- ),
- 'fastcgi_config_syntax' => array(
- 'datatype' => 'INTEGER',
- 'formtype' => 'SELECT',
- 'default' => '2',
- 'value' => array('1' => 'Old (apache 2.0)', '2' => 'New (apache 2.2)'),
- 'width' => '40',
- 'maxlength' => '255'
- ),
+ )
//#################################
// ENDE Datatable fields
//#################################
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index c36b482e725b69399afc657065c3b0ade563ca02..db476a091c4fc687df9e01dd86c6ffcaa5b4135e 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -26,12 +26,6 @@
-
diff --git a/server/conf/apache_apps.vhost.master b/server/conf/apache_apps.vhost.master
index 7dc2fd9ddf679462b6bb71740edc7a08625f17cc..ecd3ff1a0ec076731e0f99dd8fa79dc52beb78c1 100644
--- a/server/conf/apache_apps.vhost.master
+++ b/server/conf/apache_apps.vhost.master
@@ -24,12 +24,7 @@
Options FollowSymLinks
AllowOverride None
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -39,12 +34,7 @@
Options FollowSymLinks
AllowOverride None
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -58,12 +48,7 @@
SetHandler fcgid-script
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
-
Require all granted
-
- Order allow,deny
- Allow from all
-
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 6165f0496b1624fef7f5aefdeb81717413359974..c5bdb0a2d7b7746c98ead2887fc24cbf227ecd66 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -27,131 +27,63 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
# Do not allow access to the root file system of the server for security reasons
Options -Indexes
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
# Except of the following directories that contain website scripts
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# Allow access to mailman on OpenSuSE
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
Options +FollowSymLinks
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# allow path to awstats and alias for awstats icons
-
Require all granted
-
- Order allow,deny
- Allow from all
-
Alias /awstats-icon "/usr/share/awstats/icon"
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
-
Require all granted
-
- Order allow,deny
- Allow from all
-
AssignUserId www-data www-data
-
-
-NameVirtualHost *:80
-NameVirtualHost *:443
-
-NameVirtualHost {tmpl_var name="ip_address"}:{tmpl_var name="port"}
-
-
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 52b0dc37204d9a5c0714c29eeb7e13636ffaab70..05390b54d3ddb955c38515dfeb95831a2fcc61c4 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -2,12 +2,7 @@
AllowOverride None
-
Require all denied
-
- Order Deny,Allow
- Deny from all
-
@@ -89,12 +84,7 @@ DocumentRoot
Options +FollowSymLinks
AllowOverride
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# ssi enabled
@@ -104,13 +94,7 @@ DocumentRoot
-
Require all denied
-
- Order allow,deny
- Deny from all
- Allow from none
-
@@ -121,12 +105,7 @@ DocumentRoot
Options +FollowSymLinks
AllowOverride
-
Require all granted
-
- Order allow,deny
- Allow from all
-
# ssi enabled
@@ -136,13 +115,7 @@ DocumentRoot
-
Require all denied
-
- Order allow,deny
- Deny from all
- Allow from none
-
@@ -209,12 +182,7 @@ DocumentRoot
# cgi enabled
-
Require all granted
-
- Order allow,deny
- Allow from all
-
ScriptAlias /cgi-bin/ /cgi-bin/
@@ -245,7 +213,6 @@ DocumentRoot
# php as fast-cgi enabled
# For config options see: http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
-
FcgidIdleTimeout 300
FcgidProcessLifeTime 3600
# FcgidMaxProcesses 1000
@@ -256,16 +223,6 @@ DocumentRoot
FcgidIOTimeout 600
FcgidBusyTimeout 3600
FcgidMaxRequestLen 1073741824
-
- IdleTimeout 300
- ProcessLifeTime 3600
- # MaxProcessCount 1000
- DefaultMinClassProcessCount 0
- DefaultMaxClassProcessCount 10
- IPCConnectTimeout 3
- IPCCommTimeout 600
- BusyTimeout 3600
-
@@ -277,12 +234,7 @@ DocumentRoot
FCGIWrapper .php5
Options +ExecCGI
AllowOverride
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -294,23 +246,13 @@ DocumentRoot
FCGIWrapper .php5
Options +ExecCGI
AllowOverride
-
Require all granted
-
- Order allow,deny
- Allow from all
-
-
Require all granted
-
- Order allow,deny
- Allow from all
-
@@ -377,10 +319,8 @@ DocumentRoot
RewriteEngine on
-
RewriteCond %{REQUEST_URI} ^/\.well-known/acme-challenge/
RewriteRule ^ - [END]
-
diff --git a/server/lib/classes/plugin_webserver_apache.inc.php b/server/lib/classes/plugin_webserver_apache.inc.php
index 8393f529a2469bc61a14efa6aeeb46f1dcc44646..bed651b680e222c11aac51b924b812b333077838 100644
--- a/server/lib/classes/plugin_webserver_apache.inc.php
+++ b/server/lib/classes/plugin_webserver_apache.inc.php
@@ -367,7 +367,6 @@ class plugin_webserver_apache {
$tpl->setVar('fastcgi_alias', $fastcgi_config['fastcgi_alias']);
$tpl->setVar('fastcgi_starter_path', $fastcgi_starter_path);
$tpl->setVar('fastcgi_starter_script', $fastcgi_config['fastcgi_starter_script'].(($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') ? '_web' . $data['new']['domain_id'] : ''));
- $tpl->setVar('fastcgi_config_syntax', $fastcgi_config['fastcgi_config_syntax']);
$tpl->setVar('fastcgi_max_requests', $fastcgi_config['fastcgi_max_requests']);
} else {
diff --git a/server/lib/classes/plugin_webserver_base.inc.php b/server/lib/classes/plugin_webserver_base.inc.php
index 184f08ce447785c81ca1a3b0c9e6c6395addbbf6..1fb4f7131d3b6b0b9a99313914fcee0063a94fcf 100644
--- a/server/lib/classes/plugin_webserver_base.inc.php
+++ b/server/lib/classes/plugin_webserver_base.inc.php
@@ -2921,8 +2921,6 @@ class plugin_webserver_base {
$output .= "AuthUserFile $webdavRoot/$file\n";
$output .= "Require valid-user\n";
$output .= "Options +Indexes\n";
- if($app->system->getapacheversion()<=2.2)
- $output .= "Order allow,deny\nAllow from all\n";
$output .= "\n";
}
}
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index f4d94743a16c82903215378d2aac5993a4a05af9..d681761d4451df16a042907532658bacf1303939 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1945,20 +1945,20 @@ class system{
elseif($this->is_installed('apachectl')) $cmd = 'apachectl -v';
else {
$app->log("Could not check apache version, apachectl not found.", LOGLEVEL_DEBUG);
- return '2.2';
+ return '2.4';
}
exec($cmd, $output, $return_var);
if($return_var != 0 || !$output[0]) {
$app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN);
- return '2.2';
+ return '2.4';
}
if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : '');
} else {
$app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN);
- return '2.2';
+ return '2.4';
}
}