From bdeb1ea9de0c59f50acffbf7f01baf711fa0025f Mon Sep 17 00:00:00 2001
From: Cao Hung <caophihung94@gmail.com>
Date: Wed, 19 Aug 2020 14:08:08 +0700
Subject: [PATCH 1/2] fix redirect https://www.example.com to
 https://example.com

---
 menu/controller/ssl/create | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/menu/controller/ssl/create b/menu/controller/ssl/create
index 21cfadf..e4d0729 100644
--- a/menu/controller/ssl/create
+++ b/menu/controller/ssl/create
@@ -168,7 +168,15 @@ server {
 
 server {
     listen 443 ssl http2;
-    server_name ${domain} www.${domain};
+    server_name www.${domain};
+    return 301 https://${domain}$request_uri;
+	ssl_certificate         /etc/nginx/ssl/${domain}/fullchain.pem;
+    ssl_certificate_key     /etc/nginx/ssl/${domain}/privkey.pem;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name ${domain};
 
     access_log off;
     #access_log /home/${username}/${domain}/logs/access.log;

From 34b7cfb01a7f7541f8cd56c2539cf9d2da127589 Mon Sep 17 00:00:00 2001
From: Cao Hung <caophihung94@gmail.com>
Date: Wed, 19 Aug 2020 14:46:15 +0700
Subject: [PATCH 2/2] fix redirect https://www.example.com to
 https://example.com

---
 menu/controller/domain/rewrite_config | 31 +++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/menu/controller/domain/rewrite_config b/menu/controller/domain/rewrite_config
index ea9ed09..d984095 100644
--- a/menu/controller/domain/rewrite_config
+++ b/menu/controller/domain/rewrite_config
@@ -97,9 +97,17 @@ upstream php-${username} {
     server ${fastcgi_pass}
 }
 
+server {
+    listen 443 ssl http2;
+    server_name www.${domain};
+    return 301 https://${domain}$request_uri;
+	ssl_certificate /etc/letsencrypt/live/${domain}/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/${domain}/privkey.pem; # managed by Certbot
+}
+
 server {
     listen 443 ssl http2; # managed by Certbot
-    server_name ${domain} www.${domain};
+    server_name ${domain};
 
     ssl_certificate /etc/letsencrypt/live/${domain}/fullchain.pem; # managed by Certbot
     ssl_certificate_key /etc/letsencrypt/live/${domain}/privkey.pem; # managed by Certbot
@@ -135,14 +143,11 @@ server {
 }
 
 server {
-    if (\$host = ${domain}) {
-        return 301 https://\$host\$request_uri;
-    } # managed by Certbot
-
-    listen 80;
-    server_name ${domain} www.${domain};
-    return 404; # managed by Certbot
+	listen 80;
+	server_name ${domain} www.${domain};
+	return       301 https://${domain}$request_uri;
 }
+
 END
 }
 
@@ -168,7 +173,15 @@ server {
 
 server {
     listen 443 ssl http2;
-    server_name ${domain} www.${domain};
+    server_name www.${domain};
+    return 301 https://${domain}$request_uri;
+	ssl_certificate         /etc/nginx/ssl/"${domain}"/fullchain.pem;
+    ssl_certificate_key     /etc/nginx/ssl/"${domain}"/privkey.pem;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name ${domain};
 
     access_log off;
     #access_log /home/${username}/${domain}/logs/access.log;