Merge pull request #26 from TheSecretOrganization/admin-page

Fix - Redirected Django Admin Page

.env.template

@@ -1,16 +1,15 @@
 # Nginx
 HOSTNAME=
 BASE_URL=
-API_BASE_URL=
 
 # Django
 DEBUG=
 SECRET_KEY=
 DJANGO_SUPERUSER_USERNAME=
 DJANGO_SUPERUSER_EMAIL=
 DJANGO_SUPERUSER_PASSWORD=
-DJANGO_ALLOWED_HOSTS=${HOSTNAME} ${BASE_URL} ${API_BASE_URL}
-DJANGO_CSRF_TRUSTED_ORIGINS=${BASE_URL} ${API_BASE_URL}
+DJANGO_ALLOWED_HOSTS=${HOSTNAME} ${BASE_URL}
+DJANGO_CSRF_TRUSTED_ORIGINS=${BASE_URL}
 
 # Database
 POSTGRES_DB=

django/src/ft_transcendence/urls.py

@@ -22,7 +22,7 @@
 router = routers.DefaultRouter()
 
 urlpatterns = [
+    path('/', include(router.urls)),
     path('admin/', admin.site.urls),
-    path('api/', include(router.urls)),
-    path('api/pages/<str:page_name>/', PagesView.as_view(), name='pages'),
+    path('pages/<str:page_name>/', PagesView.as_view(), name='pages'),
 ]

docker-compose.yml

@@ -30,7 +30,10 @@ services:
 
   nginx:
     container_name: nginx
-    build: nginx
+    build:
+      context: nginx
+      args:
+        HOSTNAME: ${HOSTNAME}
     ports:
       - 8080:80
     init: true
@@ -40,11 +43,13 @@ services:
       - nginx-src:/usr/share/nginx
       - static-files:/static
       - media-files:/media
+    env_file:
+      - .env
     depends_on:
       django:
         condition: service_healthy
     healthcheck:
-      test: ["CMD-SHELL", "curl -o /dev/null -s -w '%{http_code}' http://localhost/ | grep 200 || exit 1"]
+      test: ["CMD-SHELL", "curl -o /dev/null -s -w '%{http_code}' ${BASE_URL} | grep 200 || exit 1"]
       interval: 2s
       timeout: 2s
       retries: 5

nginx/Dockerfile

@@ -1,10 +1,14 @@
 FROM nginx:1.26.1
 
+ARG HOSTNAME
+ENV HOSTNAME=${HOSTNAME}
+
 EXPOSE 80
 VOLUME [ "/usr/share/nginx" ]
 
 RUN apt update && apt upgrade -y
 
-COPY conf/nginx.conf /etc/nginx/conf.d/default.conf
+COPY conf/default.conf.template /etc/nginx/conf.d/default.conf.template
+RUN envsubst '${HOSTNAME}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 
 CMD [ "nginx", "-g", "daemon off;" ]

nginx/conf/nginx.conf → nginx/conf/default.conf.template

@@ -4,33 +4,37 @@ upstream django {
 
 server {
 	listen 80;
-	server_name ft_transcendence;
+	server_name ${HOSTNAME};
 
-    # Serve the frontend
     root /usr/share/nginx;
     index index.html;
 
     location / {
         try_files $uri $uri/ /index.html =404;
     }
 
-    # Serve static files for Django
     location /static/ {
         alias /static/;
         expires 30d;
         access_log off;
 	}
 
-    # Serve media files for Django
     location /media/ {
         alias /media/;
         expires 30d;
         access_log off;
     }
 
-    # Proxy requests to the Django backend
     location /api/ {
-        proxy_pass http://django;
+        proxy_pass http://django/;
+        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;
+    }
+
+    location /admin/ {
+        proxy_pass http://django/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;