From 3753625b20850de55911783b4900ec9c7d17eb69 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 9 Dec 2020 17:17:30 +0100
Subject: [PATCH] Updating nginx configuration for 2.8

---
 tmpl/handler-nginx.conf | 5 ++---
 tmpl/manager-nginx.conf | 9 ++++-----
 tmpl/portal-nginx.conf  | 9 ++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/tmpl/handler-nginx.conf b/tmpl/handler-nginx.conf
index 726bc86..f7dcbf4 100644
--- a/tmpl/handler-nginx.conf
+++ b/tmpl/handler-nginx.conf
@@ -23,8 +23,7 @@ server {
 }
 
 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
 %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@@ -62,7 +61,7 @@ server {
     deny all;
 
     # Uncomment this if you use https only
-    #add_header Strict-Transport-Security "max-age=15768000";
+    add_header Strict-Transport-Security "max-age=15768000";
   }
 
 }
diff --git a/tmpl/manager-nginx.conf b/tmpl/manager-nginx.conf
index b1db898..4399ed3 100644
--- a/tmpl/manager-nginx.conf
+++ b/tmpl/manager-nginx.conf
@@ -5,8 +5,7 @@ server {
 }
 
 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
   %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@@ -70,8 +69,8 @@ server {
 
   # DEBIAN
   # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  #location /javascript/ {
-  #  alias /usr/share/javascript/;
-  #}
+  location /javascript/ {
+    alias /usr/share/javascript/;
+  }
 
 }
diff --git a/tmpl/portal-nginx.conf b/tmpl/portal-nginx.conf
index c754ac4..634f4f8 100644
--- a/tmpl/portal-nginx.conf
+++ b/tmpl/portal-nginx.conf
@@ -15,8 +15,7 @@ server {
 }
 
 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
 %if %%cert_type == "letsencrypt"
   ssl_certificate %%le_config_dir/live/%%authWebName/cert.pem;
   ssl_certificate_key %%le_config_dir/live/%%authWebName/privkey.pem;
@@ -83,7 +82,7 @@ server {
 
   # DEBIAN
   # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  #location /javascript/ {
-  #  alias /usr/share/javascript/;
-  #}
+  location /javascript/ {
+    alias /usr/share/javascript/;
+  }
 }