Resolve "Update deployment configuration of APIs (TMF api, osapi, oasapi)"

Closes #11 (closed)

compose/nginx/nginx.conf.default

@@ -30,39 +30,30 @@ http {
 
     #include /etc/nginx/conf.d/*.conf;
 
-     server {
-		listen 80;
+    server {
+	    listen 80;
 		listen [::]:80;
 		server_name  localhost;
 
-       location / {
-                        root /webstatic/services/;
-                        index index.html;
-                        try_files $uri $uri/ /index.html;
-                }
-
-
-#        location / {
-#                        root /webstatic/nfvportal/openslicehome;
-#                        index index.html;
-#        }
-
-
-
-       location /nfvportal {
-                        root /webstatic;
-                        index index.html;
-                        autoindex off;
-                        try_files $uri $uri/ /nfvportal/index.html;
+        location / {
+            root /webstatic/services/;
+            index index.html;
+            try_files $uri $uri/ /index.html;
         }
 
+        location /nfvportal {
+            root /webstatic;
+            index index.html;
+            autoindex off;
+            try_files $uri $uri/ /nfvportal/index.html;
+        }
 
-        	
         location /osapi {
 	        proxy_pass http://osportalapi:13000/osapi;
 			proxy_set_header  X-Real-IP $remote_addr;
 			proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
 			proxy_set_header  Host $http_host;
+            proxy_set_header  X-Forwarded-Proto $scheme;
         }
         
         location /tmf-api {
@@ -70,6 +61,7 @@ http {
 			proxy_set_header  X-Real-IP $remote_addr;
 			proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
 			proxy_set_header  Host $http_host;
+            proxy_set_header  X-Forwarded-Proto $scheme;
         }
         
         location /oas-api {
@@ -77,46 +69,37 @@ http {
 			proxy_set_header  X-Real-IP $remote_addr;
 			proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
 			proxy_set_header  Host $http_host;
+            proxy_set_header  X-Forwarded-Proto $scheme;
         }
         
+        # For http
         location /auth {
-                proxy_pass http://keycloak:8080/auth;
-                        proxy_set_header  X-Real-IP $remote_addr;
-                        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-                        proxy_set_header  Host $http_host;
+            proxy_pass http://keycloak:8080/auth;
+            proxy_set_header  X-Real-IP $remote_addr;
+            proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header  Host $http_host;
         }
         
         location /kroki {
-                rewrite /kroki/(.*) /$1  break;
-                proxy_pass http://kroki:8000;
-                        proxy_set_header  X-Real-IP $remote_addr;
-                        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-                        proxy_set_header  Host $http_host;
+            rewrite /kroki/(.*) /$1  break;
+            proxy_pass http://kroki:8000;
+            proxy_set_header  X-Real-IP $remote_addr;
+            proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header  Host $http_host;
         }
 
-
-#         location /auth {
-#                        proxy_pass https://keycloak:8443/auth;
-#                        proxy_set_header  X-Real-IP $remote_addr;
-#                        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-#                        proxy_set_header Host $http_host;
-#                        proxy_set_header X-Forwarded-Server $host;
-#                        proxy_set_header X-Forwarded-Proto $scheme;
-#                        proxy_set_header X-Forwarded-Port   443;
-#        }
-        
-
+        # For https
+#        location /auth {
+#            proxy_pass https://keycloak:8443/auth;
+#            proxy_set_header  X-Real-IP $remote_addr;
+#            proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+#            proxy_set_header Host $http_host;
+#            proxy_set_header X-Forwarded-Server $host;
+#            proxy_set_header X-Forwarded-Proto $scheme;
+#            proxy_set_header X-Forwarded-Port   443;
+#       }
         
-
-     }
-
-
-
-	
-
-
-
-
+    }
 
 }