From 961e501f75567fd7ffd68dbbc02bef3c7fa57b41 Mon Sep 17 00:00:00 2001
From: xamora <xamora@42l.fr>
Date: Fri, 15 Sep 2023 15:13:52 +0200
Subject: [PATCH] Finish

---
 .env                              |  6 +++---
 docker-compose.yml                |  4 ++++
 services/mariadb/bash.sh          |  4 ++++
 services/mariadb/mariadb-init.sql |  6 +++---
 services/wordpress/bash.sh        | 10 +++++-----
 todo                              |  3 ---
 6 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 todo

diff --git a/.env b/.env
index 29b905b..629a00f 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 #MARIADB SETUP
-MYSQL_ROOT_PASSWORD=totoflute
-MYSQL_USER=bozo
-MYSQL_PASSWORD=rotule
+SQL_ROOT_PASSWORD=totoflute
+SQL_USER=bozo
+SQL_PASSWORD=rotule
 
 #WORDPRESS SETUP
 WP_ADMIN=bozo
diff --git a/docker-compose.yml b/docker-compose.yml
index 541358c..8a41018 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,6 +26,8 @@ services:
       - wordpress-files:/var/www/wordpress/
     depends_on:
       - mariadb
+    env_file:
+      - .env
 
   mariadb:
     image: mariadb
@@ -36,6 +38,8 @@ services:
     restart: always
     volumes:
       - wordpress-db:/var/lib/mysql
+    env_file:
+      - .env
 
 volumes:
   wordpress-files:
diff --git a/services/mariadb/bash.sh b/services/mariadb/bash.sh
index da445db..cdba422 100644
--- a/services/mariadb/bash.sh
+++ b/services/mariadb/bash.sh
@@ -1 +1,5 @@
+sed -i "s/\$SQL_ROOT_PASSWORD/$SQL_ROOT_PASSWORD/" /etc/mariadb-init.sql
+sed -i "s/\$SQL_USER/$SQL_USER/" /etc/mariadb-init.sql
+sed -i "s/\$SQL_PASSWORD/$SQL_PASSWORD/" /etc/mariadb-init.sql
+
 exec mariadbd --no-defaults --user=root --datadir=/var/lib/mysql --init-file=/etc/mariadb-init.sql
diff --git a/services/mariadb/mariadb-init.sql b/services/mariadb/mariadb-init.sql
index 6da2047..fe80d68 100644
--- a/services/mariadb/mariadb-init.sql
+++ b/services/mariadb/mariadb-init.sql
@@ -1,5 +1,5 @@
 CREATE DATABASE IF NOT EXISTS wordpress;
-CREATE USER IF NOT EXISTS 'Bozo'@'%';
-SET PASSWORD FOR 'Bozo'@'%' = PASSWORD('BozoPassword');
-GRANT ALL PRIVILEGES ON wordpress.* TO 'Bozo'@'%';
+CREATE USER IF NOT EXISTS '$SQL_USER'@'%';
+SET PASSWORD FOR '$SQL_USER'@'%' = PASSWORD('$SQL_PASSWORD');
+GRANT ALL PRIVILEGES ON wordpress.* TO '$SQL_USER'@'%';
 FLUSH PRIVILEGES;
diff --git a/services/wordpress/bash.sh b/services/wordpress/bash.sh
index 16c2b56..e73e9c2 100644
--- a/services/wordpress/bash.sh
+++ b/services/wordpress/bash.sh
@@ -1,10 +1,10 @@
-wp config create --dbname=wordpress --dbuser="Bozo" \
-		--dbpass="BozoPassword" --dbhost=mariadb --force
+wp config create --dbname=wordpress --dbuser="$SQL_USER" \
+		--dbpass="$SQL_PASSWORD" --dbhost=mariadb --force
 
-wp core is-installed || wp core install --url=erey-bet.42.fr --title="BozoLand" --admin_user="erey-bet" \
-		--admin_password="totoflute" --admin_email="erey-bet"@mail.org --skip-email
+wp core is-installed || wp core install --url=erey-bet.42.fr --title="BozoLand" --admin_user="$WP_ADMIN" \
+		--admin_password="$WP_ADMIN_PASSWORD" --admin_email="$WP_ADMIN"@mail.org --skip-email
 
-wp user create "kdx2a" "kdx2a"@mail.org --user_pass="kdx2a"
+wp user create "$WP_USER" "$WP_USER"@mail.org --user_pass="$WP_USER_PASSWORD"
 
 wp theme install twentytwentytwo --activate
 
diff --git a/todo b/todo
deleted file mode 100644
index b3c55f2..0000000
--- a/todo
+++ /dev/null
@@ -1,3 +0,0 @@
-- Automatiser l'install wp
-- Save les creds dans un .env
-- Makefile