simplify nginx configuration

cytomine · Nov 12, 2019 · f54e835 · f54e835
1 parent 8b13423
commit f54e835
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 35 deletions.
diff --git a/configs/nginx/nginx.conf.sample b/configs/nginx/nginx.conf.sample
@@ -48,61 +48,31 @@ http {
         root /tmp/dist;
         index index.html;
 
-        location /j_spring_security { # check and logout
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-            proxy_pass http://core:8080;
-        }
-        location /login {
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-            proxy_pass http://core:8080;
-        }
-        location /logout {
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-            proxy_pass http://core:8080;
-        }
         location /api {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_pass http://core:8080;
         }
-        location /server {
+        location /j_spring_security { # check and logout
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_pass http://core:8080;
         }
-        location /session {
+        location ~ /(login|logout) {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_pass http://core:8080;
         }
-        location /custom-ui {
+        location ~ /(server|session|custom-ui|static) {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Host $host;
             proxy_pass http://core:8080;
         }
-        location /restApiDoc {
+        location ~ /(restApiDoc|js/jsondoc|css/jsondoc) {
                proxy_set_header X-Real-IP $remote_addr;
                proxy_set_header Host $host;
                proxy_pass http://core:8080;
         }
-        location /js/jsondoc {
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Host $host;
-                proxy_pass http://core:8080;
-        }
-        location /css/jsondoc {
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Host $host;
-                proxy_pass http://core:8080;
-        }
-        location /static {
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Host $host;
-                proxy_pass http://core:8080;
-        }
 
     }
     server {

diff --git a/configuration.sh b/configuration.sh
@@ -42,7 +42,7 @@ RABBITMQ_PASS="router"
 
 
 
-# You don't to change the datas below this line instead of advanced customization
+# You don't have to change the datas below this line instead of advanced customization
 # ---------------------------
 
 NB_IIP_PROCESS=10