From f6f810fa31c66e7abe2ca3f2fcf64bfec3bb1f9c Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Mon, 29 Nov 2021 20:36:03 +0100
Subject: [PATCH] ssl addition

---
 ubooquity/config.json                       | 12 +++---
 ubooquity/rootfs/etc/nginx/servers/ssl.conf | 41 ++++++++++++++-------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/ubooquity/config.json b/ubooquity/config.json
index 17565fe3d..62a70735c 100644
--- a/ubooquity/config.json
+++ b/ubooquity/config.json
@@ -19,14 +19,12 @@
     "cifspassword": "folder"
   },
   "ports": {
-    "2202/tcp": 2202,
-    "2203/tcp": 2203,
-    "2205/tcp": 2205    
+    "2205/tcp": 2202,
+    "2206/tcp": 2203
   },
   "ports_description": {
-    "2202/tcp": "Library page (to expose)",
-    "2203/tcp": "Admin page (local)",
-    "2205/tcp": "nginx test"
+    "2205/tcp": "Library page (to expose)",
+    "2206/tcp": "Admin page (local)"
   },
   "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
   "schema": {
@@ -48,5 +46,5 @@
   "upstream": "2.1.2",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "version": "2.1.2-3",
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:2203]/ubooquity/admin"
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:2206]/ubooquity/admin"
 }
diff --git a/ubooquity/rootfs/etc/nginx/servers/ssl.conf b/ubooquity/rootfs/etc/nginx/servers/ssl.conf
index 10ad81247..c7f59ac58 100644
--- a/ubooquity/rootfs/etc/nginx/servers/ssl.conf
+++ b/ubooquity/rootfs/etc/nginx/servers/ssl.conf
@@ -1,20 +1,33 @@
 server {
-    listen %%interface%%:%%port%% default_server;
+    listen %%interface%%:2205 default_server;
     include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    
+    include /etc/nginx/includes/proxy_params.conf; 
     client_max_body_size 0;
 
-    location / { 
-       add_header Access-Control-Allow-Origin *;   
-       proxy_read_timeout 30;
-       proxy_pass         http://127.0.0.1:2202/ubooquity/;
-  }
-  
-      location /admin/ { 
-       add_header Access-Control-Allow-Origin *;   
-       proxy_read_timeout 30;
-       proxy_pass         http://127.0.0.1:2203/ubooquity/;
-  }
+    location / {
+        set $upstream_port 2202;
+        proxy_pass http://127.0.0.1:$upstream_port;
+    }
   
 }
+
+server {
+    listen %%interface%%:2206 default_server;
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf; 
+    client_max_body_size 0;
+    location /ubooquity/admin {
+        set $upstream_port 2203;
+        proxy_pass http://127.0.0.1:$upstream_port;
+    }
+
+    location /ubooquity/admin-res {
+        set $upstream_port 2203;
+        proxy_pass http://127.0.0.1:$upstream_port;
+    }
+
+    location /ubooquity/admin-api {
+        set $upstream_port 2203;
+        proxy_pass http://127.0.0.1:$upstream_port;
+    }
+}