From 7082bef10bad9f7ef7023eb29ae55152b05c7b88 Mon Sep 17 00:00:00 2001
From: Ulrich Block <ulblock@gmx.de>
Date: Sun, 11 Dec 2016 15:36:41 +0100
Subject: [PATCH] FIX #550 Webhosting http redirect

---
 js/default/httpd_default_values.js | 13 +++++++++++++
 stuff/admin/web_master.php         | 19 +++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/js/default/httpd_default_values.js b/js/default/httpd_default_values.js
index d98f94b6..c469d382 100644
--- a/js/default/httpd_default_values.js
+++ b/js/default/httpd_default_values.js
@@ -44,8 +44,15 @@ function loadServerSettings (serverType, usageType) {
 
         defaultRestartCMD = 'sudo /etc/init.d/nginx reload';
 
+        /* Add redirect from www. -> non www. */
         defaultVhostTemplate = 'server {\r\n';
         defaultVhostTemplate += '   listen 80;\r\n';
+        defaultVhostTemplate += '   server_name www.%domain%;\r\n';
+        defaultVhostTemplate += '   return 301 $scheme://%domain%$request_uri;\r\n';
+        defaultVhostTemplate += '}\r\n';
+
+        defaultVhostTemplate += 'server {\r\n';
+        defaultVhostTemplate += '   listen 80;\r\n';
         defaultVhostTemplate += '   server_name %domain%;\r\n';
         defaultVhostTemplate += '   autoindex off;\r\n';
         defaultVhostTemplate += '   access_log %vhostpath%/%user%/%logDir%/access_%domain%.log;\r\n';
@@ -89,7 +96,13 @@ function loadServerSettings (serverType, usageType) {
 
         defaultRestartCMD = 'sudo /etc/init.d/apache2 reload';
 
+        /* Add redirect from www. -> non www. */
         defaultVhostTemplate = '<VirtualHost *:80>\r\n';
+        defaultVhostTemplate += '    ServerName www.%domain%\r\n';
+        defaultVhostTemplate += '    ServerName Redirect 301 / http://%domain%/\r\n';
+        defaultVhostTemplate += '</VirtualHost>\r\n';
+
+        defaultVhostTemplate += '<VirtualHost *:80>\r\n';
         defaultVhostTemplate += '    ServerAdmin %email%\r\n';
         defaultVhostTemplate += '    DocumentRoot "%vhostpath%/%user%/%htdocs%/%path%"\r\n';
         defaultVhostTemplate += '    ServerName %domain%\r\n';
diff --git a/stuff/admin/web_master.php b/stuff/admin/web_master.php
index c9217a32..bf4f8994 100644
--- a/stuff/admin/web_master.php
+++ b/stuff/admin/web_master.php
@@ -151,9 +151,15 @@ php_admin_flag mod_rewrite off = OFF';
 if (!$vhostTemplate or strlen($vhostTemplate) < 2) {
     if ($serverType == 'N') {
 
+        $vhostTemplate = 'server {
+   listen 80;
+   server_name www.%domain%;
+   return 301 $scheme://%domain%$request_uri;
+}';
+
         if ($usageType == 'F') {
 
-            $vhostTemplate = 'server {
+            $vhostTemplate .= 'server {
     listen 80;
     server_name %domain%;
     autoindex off;
@@ -167,7 +173,7 @@ if (!$vhostTemplate or strlen($vhostTemplate) < 2) {
 
         } else {
 
-            $vhostTemplate = 'server {
+            $vhostTemplate .= 'server {
    listen 80;
    server_name %domain%;
    autoindex off;
@@ -201,9 +207,14 @@ allow_url_include=Off
 
     } else if ($serverType == 'A') {
 
+        $vhostTemplate = '<VirtualHost *:80>
+    ServerName www.%domain%
+    ServerName Redirect 301 / http://%domain%/
+</VirtualHost>';
+
         if ($usageType == 'F') {
 
-            $vhostTemplate = '<VirtualHost *:80>
+            $vhostTemplate .= '<VirtualHost *:80>
     ServerAdmin %email%
     DocumentRoot "%vhostpath%/%user%/%htdocs%/%path%"
     ServerName %domain%
@@ -224,7 +235,7 @@ allow_url_include=Off
 
         } else {
 
-            $vhostTemplate = '<VirtualHost *:80>
+            $vhostTemplate .= '<VirtualHost *:80>
     ServerAdmin %email%
     DocumentRoot "%vhostpath%/%user%/%htdocs%/%path%"
     ServerName %domain%