diff --git a/Makefile b/Makefile index 9f56f6e..1f82055 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,6 @@ create-volumes: start-docker: @echo "Starting Docker Compose in detached mode..." - @docker-compose -f $(DOCKER_COMPOSE_FILE) up -d --build + @docker-compose -f $(DOCKER_COMPOSE_FILE) up --build .PHONY: all re down clean setup-hosts create-volumes start-docker sudo-validate diff --git a/srcs/.env b/srcs/.env index 6c93c95..d3e435a 100644 --- a/srcs/.env +++ b/srcs/.env @@ -1,16 +1,16 @@ DOMAIN_NAME=fgras-ca.42.fr + CERTS_=/etc/nginx/ssl/inception.key MYSQL_HOSTNAME=mariadb MYSQL_DATABASE=wordpress MYSQL_USER=fgras MYSQL_PASSWORD=1234 MYSQL_ROOT_PASSWORD=5678 + WP_TITLE=FernandGrasCalvet -WP_ADMIN_USR=fgras-ca +WP_ADMIN_USR=fgras WP_ADMIN_PWD=1234 WP_ADMIN_EMAIL=fgras.ca@gmail.com -WP_USR=fgras +WP_USR=fgras2 WP_EMAIL=fgras.ca@42.com WP_PWD=123 -ftp_user=Dino -ftp_pwd=gg66! diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 3fe8e90..4ca5588 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -32,7 +32,7 @@ services: - inception volumes: - wordpress_data:/var/www/html - restart: always + restart: on-failure nginx: container_name: nginx diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index 24e4e71..abf5dbf 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -13,7 +13,7 @@ RUN apt update -y && apt upgrade -y && \ # Copier les fichiers de configuration PHP et le script d'auto-configuration COPY ./conf/www.conf /etc/php/7.4/fpm/pool.d/www.conf -COPY ./conf/wp-config.php /var/www/html/ +COPY ./conf/wp-config.php /var/www/html/wp-config.php COPY ./tools/auto_config.sh /usr/local/bin/ # Assurer les bonnes permissions pour les fichiers @@ -22,8 +22,7 @@ RUN chmod +x /usr/local/bin/auto_config.sh && \ chown -R www-data:www-data /var/www/html ; \ chown www-data:www-data /var/www/html/index.php RUN chmod -R 777 /var/www/html -COPY ./conf/web /var/www/html -RUN chmod -R 777 /var/www/html + ENTRYPOINT ["/usr/local/bin/auto_config.sh"] diff --git a/srcs/requirements/wordpress/conf/web/Inception_Visual.webp b/srcs/requirements/wordpress/conf/web/Inception_Visual.webp deleted file mode 100644 index dfa616a..0000000 Binary files a/srcs/requirements/wordpress/conf/web/Inception_Visual.webp and /dev/null differ diff --git a/srcs/requirements/wordpress/conf/web/index.html b/srcs/requirements/wordpress/conf/web/index.html deleted file mode 100644 index e49b153..0000000 --- a/srcs/requirements/wordpress/conf/web/index.html +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - INCEPTION - 42 Perpignan - - - - -
-
-
INCEPTION
-
42 Perpignan
-
fgras-ca
-
- -
- -
-
- - - diff --git a/srcs/requirements/wordpress/conf/web/index.php b/srcs/requirements/wordpress/conf/web/index.php deleted file mode 100644 index e49b153..0000000 --- a/srcs/requirements/wordpress/conf/web/index.php +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - INCEPTION - 42 Perpignan - - - - -
-
-
INCEPTION
-
42 Perpignan
-
fgras-ca
-
- -
- -
-
- - - diff --git a/srcs/requirements/wordpress/conf/web/jump_scare_image.webp b/srcs/requirements/wordpress/conf/web/jump_scare_image.webp deleted file mode 100644 index 6270cfc..0000000 Binary files a/srcs/requirements/wordpress/conf/web/jump_scare_image.webp and /dev/null differ diff --git a/srcs/requirements/wordpress/conf/wp-config.php b/srcs/requirements/wordpress/conf/wp-config.php index 3c167a1..9a52d10 100644 --- a/srcs/requirements/wordpress/conf/wp-config.php +++ b/srcs/requirements/wordpress/conf/wp-config.php @@ -1,18 +1,28 @@ `fGisKDii7agi^P}-@}Gm#m>A6Gb|'); define('NONCE_SALT', 'ZaiFh{H~?Z34?18v[=Wi