From f1f8d3adfc17ea6d9be713ebad981a9353320dd1 Mon Sep 17 00:00:00 2001
From: mcolonna <mcolonna@student.42perpignan.fr>
Date: Tue, 17 Jun 2025 13:40:58 +0200
Subject: [PATCH] dev: domain name in .env

---
 srcs/.env => .env                       | 1 +
 Makefile                                | 4 ++--
 srcs/docker-compose.yml                 | 1 -
 srcs/requirements/nginx/conf/nginx.conf | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename srcs/.env => .env (65%)

diff --git a/srcs/.env b/.env
similarity index 65%
rename from srcs/.env
rename to .env
index e419ce1..e6fe604 100644
--- a/srcs/.env
+++ b/.env
@@ -1 +1,2 @@
+DOMAIN=mcolonna.42.fr
 DATABASE_PWD=SuperComplexDatabasePassword
diff --git a/Makefile b/Makefile
index 4aa5d62..5f796c5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ BUILD_PATH=__build/
 DOCKER=docker
 MKTEMP=mktemp
 
-DOMAIN=mcolonna.42.fr
+include .env
 
 SRC_COMPOSE=srcs/
 SRC_WWW_MORE=srcs/www/
@@ -31,7 +31,7 @@ run : $(CERT_PATH_FILES)
 
 	echoo "Running '$(SRC_COMPOSE)'..."
 	cd -- $(SRC_COMPOSE)
-	$(DOCKER) compose up --build
+	DATABASE_PWD="$(DATABASE_PWD)" $(DOCKER) compose up --build
 	cd -
 
 
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 9b5547f..8d0c141 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -11,7 +11,6 @@ services:
     volumes:
       - www:/www:ro
       - ./__cert:/cert:ro
-    # domainname: mcolonna.42.fr # TODO(vm) useful? # TODO(any)(nocopy)
 
   wordpress:
     build: ./requirements/wordpress
diff --git a/srcs/requirements/nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf
index 534f3d1..ce34f77 100644
--- a/srcs/requirements/nginx/conf/nginx.conf
+++ b/srcs/requirements/nginx/conf/nginx.conf
@@ -26,13 +26,12 @@ http {
 
 	server {
 		listen               443 ssl;
-		server_name          mcolonna.42.fr; # TODO(any)(nocopy)
 		ssl_certificate      /cert/cert.crt;
 		ssl_certificate_key  /cert/cert.key;
 		ssl_protocols        TLSv1.3;
 		error_page 497 =301 /497.php;
 
-		access_log  /var/log/nginx/mcolonna.42.fr.access.log  main;
+		access_log  /var/log/nginx/access.log  main;
 
 		location / {
 			root   /www;