From 83939acf55b5ffd4dc72840cd01865c0880eda3e Mon Sep 17 00:00:00 2001
From: Edi Septriyanto <me@masedi.net>
Date: Sun, 14 Jul 2024 21:57:36 +0700
Subject: [PATCH] Fix Nginx's http2 deprecation warn issue #171

---
 etc/nginx/sites-available/default-ssl | 10 ++++++----
 lib/lemper-manage.sh                  |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/etc/nginx/sites-available/default-ssl b/etc/nginx/sites-available/default-ssl
index 83cdbef..6c69834 100644
--- a/etc/nginx/sites-available/default-ssl
+++ b/etc/nginx/sites-available/default-ssl
@@ -1,8 +1,9 @@
 # Generated by LEMPer.sh
 
 server {
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;
+    http2 on;
 
     server_name localhost.localdomain;
 
@@ -146,8 +147,9 @@ server {
 
 ## LEMPer Web-based Administration
 server {
-    listen 8083 ssl http2;
-    listen [::]:8083 ssl http2;
+    listen 8083 ssl;
+    listen [::]:8083 ssl;
+    http2 on;
 
     server_name localhost.localdomain;
 
diff --git a/lib/lemper-manage.sh b/lib/lemper-manage.sh
index 9490f57..7aa84ff 100755
--- a/lib/lemper-manage.sh
+++ b/lib/lemper-manage.sh
@@ -74,6 +74,8 @@ Options:
       Remove virtual host configuration.
   -s, --enable-ssl <vhost domain name>
       Enable HTTP over SSL with Let's Encrypt.
+  -w, --enforce-non-www <vhost domain name>
+      Redirect www to non www host.
   --disable-ssl <vhost domain name>
       Disable HTTP over SSL.
   --remove-ssl <vhost domain name>
@@ -494,10 +496,10 @@ function enable_ssl() {
             if grep -qwE "^\    listen\ (\b[0-9]{1,3}\.){3}[0-9]{1,3}\b:80" "/etc/nginx/sites-available/${DOMAIN}.conf"; then
                 run sed -i "s/\:80/\:443\ ssl/g" "/etc/nginx/sites-available/${DOMAIN}.conf"
             else
-                run sed -i "s/listen\ 80/listen\ 443\ ssl\ http2/g" "/etc/nginx/sites-available/${DOMAIN}.conf"
+                run sed -i "s/listen\ 80/listen\ 443\ ssl/g" "/etc/nginx/sites-available/${DOMAIN}.conf"
             fi
 
-            run sed -i "s/listen\ \[::\]:80/listen\ \[::\]:443\ ssl\ http2/g" "/etc/nginx/sites-available/${DOMAIN}.conf"
+            run sed -i "s/listen\ \[::\]:80/listen\ \[::\]:443\ ssl/g" "/etc/nginx/sites-available/${DOMAIN}.conf"
 
             # Enable SSL configs.
             run sed -i "s/http2\ off/http2\ on/g" "/etc/nginx/sites-available/${DOMAIN}.conf"