From e9bc584efa012c28d4473c1b3bd30d55ed7fe522 Mon Sep 17 00:00:00 2001
From: Arno <arno.nanor@gmail.com>
Date: Wed, 23 Oct 2024 13:36:49 +0000
Subject: [PATCH] correction image wp

---
 misc/images/wordpress/containers/wordpress/Dockerfile  | 7 ++++---
 misc/images/wordpress/containers/wordpress/apache.conf | 3 ++-
 services/50-wordpress/apache/apache.conf               | 1 -
 services/50-wordpress/dockercompose/dockercompose.yml  | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/misc/images/wordpress/containers/wordpress/Dockerfile b/misc/images/wordpress/containers/wordpress/Dockerfile
index 1413b4b..f1078e3 100755
--- a/misc/images/wordpress/containers/wordpress/Dockerfile
+++ b/misc/images/wordpress/containers/wordpress/Dockerfile
@@ -9,13 +9,14 @@ RUN chmod +x /usr/local/bin/wp
 
 # Configuration apache
 RUN cd /app/public
-COPY apache.conf /etc/apache2/conf.d/zapp.conf
+COPY apache.conf /etc/apache2/conf.d/nine/site.conf
 
 # Installation des sources wordpress
 RUN wp core download --path=/app/public --locale=fr_FR
 RUN chown -R apache:apache /app/public
-RUN find /app/public -type d -exec chmod 755 {} +
-RUN find /app/public -type f -exec chmod 644 {} +
+RUN chmod -R u=rwX,g=rX,o=rX /app/public
+#RUN find /app/public -type d -exec chmod 755 {} +
+#RUN find /app/public -type f -exec chmod 644 {} +
 
 RUN mkdir /docker
 COPY entrypoint.sh /docker/entrypoint.sh
diff --git a/misc/images/wordpress/containers/wordpress/apache.conf b/misc/images/wordpress/containers/wordpress/apache.conf
index 6cf4914..c7f3e68 100644
--- a/misc/images/wordpress/containers/wordpress/apache.conf
+++ b/misc/images/wordpress/containers/wordpress/apache.conf
@@ -2,6 +2,7 @@ LoadModule rewrite_module modules/mod_rewrite.so
 ServerName nineapache.local
 DocumentRoot "/app/public"
 Alias /wordpress /app/public
+LogLevel alert rewrite:trace3
 <Directory "/app/public">
     Options FollowSymLinks
     AllowOverride Limit Options FileInfo
@@ -13,7 +14,7 @@ Alias /wordpress /app/public
 
     RewriteEngine On
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-    RewriteBase /wordpress/
+    RewriteBase /
     RewriteRule ^index\.php$ - [L]
 
     # add a trailing slash to /wp-admin
diff --git a/services/50-wordpress/apache/apache.conf b/services/50-wordpress/apache/apache.conf
index 68e6e13..0c32544 100644
--- a/services/50-wordpress/apache/apache.conf
+++ b/services/50-wordpress/apache/apache.conf
@@ -2,4 +2,3 @@
 # wordpress
 ProxyPass /wordpress http://wordpress/wordpress retry=0 keepalive=On
 ProxyPassReverse /wordpress http://wordpress/wordpress retry=0
-
diff --git a/services/50-wordpress/dockercompose/dockercompose.yml b/services/50-wordpress/dockercompose/dockercompose.yml
index dee5684..7dbd112 100644
--- a/services/50-wordpress/dockercompose/dockercompose.yml
+++ b/services/50-wordpress/dockercompose/dockercompose.yml
@@ -11,3 +11,5 @@ services:
       - nine-network
     volumes:
       - ./services/50-wordpress/volume/data:/app/public/wp-content    
+    ports:
+      - "8080:80"