diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index c2af3edeebf285a1104ece34f410ac2e2b68b5a3..96b34433843d4586553da08d142109050962451c 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -339,12 +339,10 @@ RewriteEngine on - RewriteCond %{HTTP_HOST} $ [NC] RewriteCond %{HTTP_HOST} ^$ [NC] RewriteRule ^(.*)$ https://$1 [R=301,L] - RewriteCond %{HTTP_HOST} $ [NC] RewriteCond %{HTTP_HOST} ^$ [NC] RewriteRule ^(.*)$ https://$1 [R=301,L] diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 525592dacce1a9718de35459bc2c48f834e9a69a..addcd138b814bbf4d0383d85f384f4c6773e40c6 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -2951,8 +2951,6 @@ class apache2_plugin { $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain']; $seo_redirects[$prefix.'seo_redirect_operator'] = '!'; } - - $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']); return $seo_redirects; } diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 408a76bca29e3d04e361aca7bb413eded6638c6c..d83ecf442f9f156f34443b86815334741b5c0070 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -2842,8 +2842,6 @@ class nginx_plugin { $seo_redirects[$prefix.'seo_redirect_operator'] = '!='; } } - - $seo_redirects[$prefix.'seo_base_domain'] = str_replace('.', '\.', $web['domain']); return $seo_redirects; }