From 3fcba3b4691a7f19c15234299e8e2cb01cb84bfb Mon Sep 17 00:00:00 2001 From: kinou-p Date: Mon, 3 Oct 2022 17:32:03 +0200 Subject: [PATCH] jsp --- Makefile | 4 ++-- srcs/.env | 5 +---- srcs/docker-compose.yml | 10 ++++++---- srcs/requirements/mariadb/tools/mySqlScript.sql | 4 ++-- srcs/requirements/wordpress/tools/start.sh | 8 ++++---- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 5f74b77..be15aad 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ all: docker-compose -f ./srcs/docker-compose.yml up --build fclean: down - -rm -rf ./srcs/wordpress + -sudo rm -rf ./srcs/wordpress -docker rm $$(docker ps -qa) -docker rmi -f $$(docker images -qa) -docker volume rm $$(docker volume ls -q) @@ -28,6 +28,6 @@ back: down: docker-compose -f ./srcs/docker-compose.yml down -re: clean +re: fclean docker-compose -f ./srcs/docker-compose.yml build --no-cache docker-compose -f ./srcs/docker-compose.yml up \ No newline at end of file diff --git a/srcs/.env b/srcs/.env index 08b614d..afcbbab 100644 --- a/srcs/.env +++ b/srcs/.env @@ -1,18 +1,15 @@ WP_URL=apommier.42.fr WP_TITLE=wordpress -WP_DB_HOST=mariadb WP_ADMIN_LOGIN=admin WP_ADMIN_PASSWORD=admin WP_ADMIN_EMAIL=admin@42.fr WP_USER_LOGIN=apommier -WP_USER_PASSWORD=apommier +WP_USER_PASSWORD=1234 WP_USER_EMAIL=apommier@student.42.fr MARIADB_DATABASE=wordpress MARIADB_USER=apommier MARIADB_PASSWORD=1234 -CERT_PATH=/etc/ssl/certs/nginx-selfsigned.crt -KEY_PATH=/etc/ssl/private/nginx-selfsigned.key diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index e4810ff..0fde076 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -5,10 +5,6 @@ services: nginx: build: requirements/nginx/ container_name: nginx - environment: - - DOMAIN_NAME=apommier.42.fr - - SSL_CERTIFICATE=/etc/ssl/certs/nginx-selfsigned.crt - - SSL_CERTIFICATE_KEY=/etc/ssl/private/nginx-selfsigned.key depends_on: - wordpress ports: @@ -23,6 +19,8 @@ services: wordpress: build: ./requirements/wordpress container_name: wordpress + env_file: + - .env volumes: - ./wordpress:/var/www/html depends_on: @@ -34,6 +32,10 @@ services: mariadb: build: ./requirements/mariadb container_name: mariadb + environment: + - MARIADB_DATABASE=${MARIADB_DATABASE} + - MARIADB_USER=${MARIADB_USER} + - MARIADB_PASSWORD=${MARIADB_PASSWORD} volumes: - ./wordpress:/var/www/html networks: diff --git a/srcs/requirements/mariadb/tools/mySqlScript.sql b/srcs/requirements/mariadb/tools/mySqlScript.sql index 902e15c..fb6c242 100644 --- a/srcs/requirements/mariadb/tools/mySqlScript.sql +++ b/srcs/requirements/mariadb/tools/mySqlScript.sql @@ -1,4 +1,4 @@ create database if not exists wordpress; -create user apommier@'%' identified by '1234'; -grant all privileges on *.* to apommier@'%'; +create user 'apommier'@'%' identified by '1234'; +grant all privileges on *.* to 'apommier'@'%'; flush privileges; \ No newline at end of file diff --git a/srcs/requirements/wordpress/tools/start.sh b/srcs/requirements/wordpress/tools/start.sh index 04dd9da..e0fd266 100644 --- a/srcs/requirements/wordpress/tools/start.sh +++ b/srcs/requirements/wordpress/tools/start.sh @@ -17,9 +17,9 @@ then echo "Wordpress: configuration..." mv /var/www/tools/wp-config.php /var/www/html/ echo "Wordpress: installation..."; - wp core install --url=apommier.42.fr --title=CoUcoU --admin_user=admin --admin_password=admin --admin_email=admin@42.fr --skip-email --allow-root; + wp core install --url=${WP_URL} --title=${WP_TITLE} --admin_user=${WP_ADMIN_LOGIN} --admin_password=${WP_ADMIN_PASSWORD} --admin_email="${WP_ADMIN_EMAIL}" --skip-email --allow-root; echo "Wordpress: create user..."; - wp user create apommier apommier@student.42.fr --user_pass=1234 --allow-root; + wp user create ${WP_USER_LOGIN} ${WP_USER_EMAIL} --user_pass=${WP_USER_PASSWORD} --allow-root; echo "Wordpress: set up!" else echo "Wordpress: setting up..." @@ -28,9 +28,9 @@ else mv wp-cli.phar /usr/local/bin/wp; cd /var/www/html; echo "Wordpress: installation..."; - wp core install --url=apommier.42.fr --title=CoUcoU --admin_user=admin --admin_password=admin --admin_email=admin@42.fr --skip-email --allow-root; + wp core install --url=${WP_URL} --title=${WP_TITLE} --admin_user=${WP_ADMIN_LOGIN} --admin_password=${WP_ADMIN_PASSWORD} --admin_email=${WP_ADMIN_EMAIL} --skip-email --allow-root; echo "Wordpress: create user..."; - wp user create apommier apommier@student.42.fr --user_pass=1234 --allow-root; + wp user create ${WP_USER_LOGIN} ${WP_USER_EMAIL} --user_pass=${WP_USER_PASSWORD} --allow-root; echo "Wordpress: set up!" fi