From fbdfcef494f4d1ea6ca24a05cd5912d22ccee922 Mon Sep 17 00:00:00 2001
From: Adam JOLY <adamjly@proton.me>
Date: Sat, 18 Jan 2025 16:38:11 +0100
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip:?=
 =?UTF-8?q?=20everything=20should=20be=20fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srcs/cmd/wordpress/entrypoint/entrypoint.go    | 8 ++++----
 srcs/configs/nginx/templates/www.conf.template | 6 +++---
 srcs/docker-compose.yml                        | 3 +--
 srcs/docker/wordpress/Dockerfile               | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcs/cmd/wordpress/entrypoint/entrypoint.go b/srcs/cmd/wordpress/entrypoint/entrypoint.go
index eb902d4..332c1ec 100644
--- a/srcs/cmd/wordpress/entrypoint/entrypoint.go
+++ b/srcs/cmd/wordpress/entrypoint/entrypoint.go
@@ -50,18 +50,18 @@ func main() {
 
 		makeFpmConf()
 
-		_, err := os.ReadFile("/usr/src/wordpress/wp-config.php")
+		_, err := os.ReadFile("/var/www/html/wp-config.php")
 
 		if err != nil && env.IsEnvSet("WORDPRESS_") {
-			content, err := os.ReadFile("/usr/src/wordpress/wp-config-docker.php")
+			content, err := os.ReadFile("/var/www/html/wp-config-docker.php")
 			if err != nil {
 				log.Fatal(err)
 			}
 			res := bytes.Replace([]byte(content), []byte("put your unique phrase here"), []byte(pass.GenStrPass(32)), -1)
-			if err := os.WriteFile("/usr/src/wordpress/wp-config.php", res, 0660); err != nil {
+			if err := os.WriteFile("/var/www/html/wp-config.php", res, 0660); err != nil {
 				log.Fatal(err)
 			}
-			cmd := exec.Command("chown", "www-data:www-data", "/usr/src/wordpress/wp-config.php")
+			cmd := exec.Command("chown", "www-data:www-data", "/var/www/html/wp-config.php")
 			cmd.Stdout = os.Stdout
 			cmd.Stderr = os.Stderr
 			if err := cmd.Run(); err == nil {
diff --git a/srcs/configs/nginx/templates/www.conf.template b/srcs/configs/nginx/templates/www.conf.template
index 34b45a3..7aa0ec9 100644
--- a/srcs/configs/nginx/templates/www.conf.template
+++ b/srcs/configs/nginx/templates/www.conf.template
@@ -3,7 +3,7 @@ server {
 
     server_name			adjoly.42.fr www.adjoly.42.fr;
 	
-    root				/var/www/html/;
+    root				/var/www/html;
     index				index.php;
 
     ssl_certificate     $NGINX_SSL_CERT_FILE;
@@ -14,13 +14,13 @@ server {
     keepalive_timeout	60;
 
     location / {
-		try_files $uri $uri/ =404;
+		try_files $${q}uri $${q}uri/ =404;
 	}
 
     location ~ \.php$ {
-        include					fastcgi.conf;
 		fastcgi_pass			$NGINX_PHP_HOST:9000;
 		fastcgi_index			index.php;
 		fastcgi_split_path_info	^(.+\.php)(/.+)$;
+		include					fastcgi.conf;
     }
 }
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 82a1436..43f77ee 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -31,8 +31,7 @@ services:
       - ./configs/nginx/templates:/etc/nginx/templates
       - ./configs/nginx/entry:/docker-entrypoint.d
     ports:
-      - "8443:443"
-      - "8080:80"
+      - "443:443"
     restart: unless-stopped
 
   wordpress-php:
diff --git a/srcs/docker/wordpress/Dockerfile b/srcs/docker/wordpress/Dockerfile
index e1096f3..c96625c 100644
--- a/srcs/docker/wordpress/Dockerfile
+++ b/srcs/docker/wordpress/Dockerfile
@@ -12,7 +12,7 @@ COPY			cmd /build/cmd
 COPY			internal /build/internal
 COPY			docker/wordpress/www-docker.conf /www-docker.conf
 
-RUN				apk add --no-cache go curl php84-fpm tzdata fcgi \
+RUN				apk add --no-cache go curl php84-mysqli php84-fpm tzdata fcgi \
 				&& cd /build \
 				&& go build git.keyzox.me/42_adjoly/inception/cmd/wordpress/entrypoint \
 				&& cp /build/entrypoint /docker-entrypoint \