diff --git a/backand/MPM/urls.py b/backand/MPM/urls.py index 571e2cc..3fa090b 100644 --- a/backand/MPM/urls.py +++ b/backand/MPM/urls.py @@ -18,5 +18,5 @@ from django.contrib import admin from django.urls import path urlpatterns = [ - path('mayo-manager/admin/', admin.site.urls), + path('mayo-manager/server/admin/', admin.site.urls), ] diff --git a/frontend/nginx.conf b/frontend/nginx.conf index 4440963..d52985d 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -41,24 +41,28 @@ http { try_files $uri $uri/ /index.html; } - # Proxy do API Django - location ~ ^/mayo-manager/api/?$ { - if ($request_uri !~ /$) { - return 301 $request_uri/; - } - proxy_pass http://mayo-production-manager-backend:7090/mayo-manager/api/; + # Redirect slash-less /mayo-manager/server/admin to /mayo-manager/server/admin/ + location = /mayo-manager/server/admin { + return 301 /mayo-manager/server/admin/; + } + + # Redirect slash-less /mayo-manager/server/api to /mayo-manager/server/api/ + location = /mayo-manager/server/api { + return 301 /mayo-manager/server/api/; + } + + # Proxy to API Django + location /mayo-manager/server/api/ { + proxy_pass http://mayo-production-manager-backend:7090/mayo-manager/server/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } - # Proxy do panelu admina Django - location ~ ^/mayo-manager/admin/?$ { - if ($request_uri !~ /$) { - return 301 $request_uri/; - } - proxy_pass http://mayo-production-manager-backend:7090/mayo-manager/admin/; + # Proxy to Django Admin panel + location /mayo-manager/server/admin/ { + proxy_pass http://mayo-production-manager-backend:7090/mayo-manager/server/admin/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;