diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 0f4a77cd9ae3eec26b11c59002349d4f166270de..271a9b8adbb667b57ab98b3dc76a96d7d8d32d66 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -4,11 +4,9 @@
ServerTokens ProductOnly
ServerSignature Off
-
SSLStaplingCache shmcb:/var/run/ocsp(128000)
-
################################################
# ISPConfig Logfile configuration for vlogger
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index d77060d3378ba0407b5cc5be2b5e95da28abd526..f97dad85b4bbaf89a8d1c93579cfe6abfc945997 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,7 +4,6 @@
######################################################
Listen
-NameVirtualHost *:
>
ServerAdmin webmaster@localhost
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 05390b54d3ddb955c38515dfeb95831a2fcc61c4..7d129e559627abf3e14cc3a86d9fb6ee814488a9 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -256,24 +256,16 @@ DocumentRoot
-
-
- SetHandler php-fcgi
-
-
- SetHandler php-fcgi
-
+
+ SetHandler php-fcgi
+
-
-
- SetHandler php-fcgi
-
-
- SetHandler php-fcgi
-
+
+ SetHandler php-fcgi
+
Action php-fcgi /php-fcgi virtual
@@ -290,13 +282,9 @@ DocumentRoot
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ fcgi://127.0.0.1:/$1
-
-
- SetHandler "proxy:fcgi://127.0.0.1:"
-
-
- SetHandler "proxy:fcgi://127.0.0.1:"
-
+
+ SetHandler "proxy:fcgi://127.0.0.1:"
+
@@ -304,13 +292,9 @@ DocumentRoot
#ProxyPassMatch ^/(.*\.php[345]?(/.*)?)$ unix://|fcgi://localhost//$1
-
-
- SetHandler "proxy:unix:|fcgi://localhost"
-
-
- SetHandler "proxy:unix:|fcgi://localhost"
-
+
+ SetHandler "proxy:unix:|fcgi://localhost"
+
@@ -325,30 +309,19 @@ DocumentRoot
RewriteCond %{HTTPS} off
- RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
RewriteCond %{HTTP_HOST} ^$ [NC]
-
- RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-
RewriteRule ^ https://%{REQUEST_URI} [R=301,NE,L]
RewriteCond %{HTTP_HOST} ^$ [NC]
-
- RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-
RewriteRule ^ https://%{REQUEST_URI} [R=301,NE,L]
RewriteCond %{HTTP_HOST} $ [NC]
-
- RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-
RewriteCond %{REQUEST_URI} !^/webdav/
RewriteCond %{REQUEST_URI} !^/php-fcgi/
@@ -361,8 +334,6 @@ DocumentRoot
RewriteCond %{HTTPS} off
- RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
-
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L,NE]