improve sdnc-web for external apps

add package manager for more flexibility

Issue-ID: SDNC-1658
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: I30f4aaa24cf05fce212282b06d5e08437dbcfa8b
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>

Former-commit-id: f41f011ff2e18befd77dd63ab828ea14aafac2a7

5 files changed, 58 insertions, 64 deletions

diff --git a/installation/sdnc-web/src/main/resources/favicon.ico b/installation/sdnc-web/src/main/resources/favicon.ico
new file mode 100644
index 00000000..650067eb
--- /dev/null
+++ b/installation/sdnc-web/src/main/resources/favicon.ico
diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf
index ea6c33be..3d9ade13 100644
--- a/installation/sdnc-web/src/main/resources/http_site.conf
+++ b/installation/sdnc-web/src/main/resources/http_site.conf
@@ -49,36 +49,5 @@ server {
 
     server_name _;
 
-    location ~ ^/$  {
-        return 301 /odlux/index.html;
-    }
-    location ~ ^/help/$  {
-        try_files /help/$args.json $uri;
-    }
-    location ~ ^/transportpce  {
-        if ($request_uri ~* "/transportpce/(.*)") { 
-            proxy_pass TRPCEURL/$1;
-        }
-    }
-    location ~ ^/topology  {
-        proxy_pass TOPOURL;
-    }
-    location ~ ^/tiles/  {
-        resolver DNS_RESOLVER;
-        if ($request_uri ~* "/tiles/(.*)") { 
-            proxy_pass TILEURL/$1;
-        }
-    }
-    location /  {
-        try_files $uri $uri/ @backend;
-    }
-    location /websocket {
-        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-    location @backend {
-        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
-    }
+    include server_blocks/location.rules;
 }
diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf
index 5e61fece..6dcfb790 100644
--- a/installation/sdnc-web/src/main/resources/https_site.conf
+++ b/installation/sdnc-web/src/main/resources/https_site.conf
@@ -68,36 +68,6 @@ server {
 
     server_name _;
 
-    location ~ ^/$  {
-        return 301 /odlux/index.html;
-    }
-    location ~ ^/help/$  {
-        try_files /help/$args.json $uri;
-    }
-    location ~ ^/transportpce  {
-        if ($request_uri ~* "/transportpce/(.*)") { 
-            proxy_pass TRPCEURL/$1;
-        }
-    }
-    location ~ ^/topology  {
-        proxy_pass TOPOURL;
-    }
-    location ~ ^/tiles/  {
-        resolver DNS_RESOLVER;
-        if ($request_uri ~* "/tiles/(.*)") { 
-            proxy_pass TILEURL/$1;
-        }
-    }
-    location /  {
-        try_files $uri $uri/ @backend;
-    }
-    location /websocket {
-        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-    location @backend {
-        proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
-    }
+    include server_blocks/location.rules;
+  
 }
diff --git a/installation/sdnc-web/src/main/resources/location.rules b/installation/sdnc-web/src/main/resources/location.rules
new file mode 100644
index 00000000..83120d60
--- /dev/null
+++ b/installation/sdnc-web/src/main/resources/location.rules
@@ -0,0 +1,46 @@
+location ~ ^/$  {
+    return 301 " /odlux/index.html";
+}
+location ~ ^/help/$  {
+    try_files /help/$args.json $uri;
+}
+location ~ ^/transportpce  {
+    resolver DNS_INTERNAL_RESOLVER;
+    if ($request_uri ~* "/transportpce/(.*)") { 
+        proxy_pass TRPCEURL/$1;
+    }
+}
+location ~ ^/topology/  {
+    resolver DNS_INTERNAL_RESOLVER;
+    proxy_pass TOPOURL;
+}
+location ~ ^/sitedoc/  {
+  resolver DNS_INTERNAL_RESOLVER;
+  if ($request_uri ~* "/sitedoc/(.*)") {
+    proxy_pass SITEDOCURL/topology/stadok/$1;
+  }
+}
+location ~ ^/tiles/  {
+    resolver DNS_RESOLVER;
+    if ($request_uri ~* "/tiles/(.*)") { 
+        proxy_pass TILEURL/$1;
+    }
+}
+location ~ ^/terrain/  {
+  resolver DNS_INTERNAL_RESOLVER;
+  if ($request_uri ~* "/terrain/(.*)") {
+    proxy_pass TERRAINURL/$1;
+  }
+}
+location /  {
+    try_files $uri $uri/ @backend;
+}
+location /websocket {
+    proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+}
+location @backend {
+    proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
+}
\ No newline at end of file
diff --git a/installation/sdnc-web/src/main/resources/odlux.application.list b/installation/sdnc-web/src/main/resources/odlux.application.list
new file mode 100644
index 00000000..9176aae6
--- /dev/null
+++ b/installation/sdnc-web/src/main/resources/odlux.application.list
@@ -0,0 +1,9 @@
+1 connectApp
+10 faultApp
+20 maintenanceApp
+30 configurationApp
+55 performanceHistoryApp
+70 inventoryApp
+75 eventLogApp
+90 mediatorApp
+200 helpApp