From 71f5624b1db4c3d5cddcb2bbaba3e78fead61531 Mon Sep 17 00:00:00 2001 From: adjoly Date: Wed, 5 Mar 2025 17:57:14 +0100 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip:?= =?UTF-8?q?=20Should=20be=20working?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 ++++++ .gitignore | 6 +++--- secrets/borg/passphrase.txt | 0 secrets/db/root_pass.txt | 0 secrets/db/user_pass.txt | 0 secrets/ftp/pass.txt | 0 secrets/wp/admin_pass.txt | 0 srcs/configs/wordpress/entry/configure-wp.sh | 5 ++--- srcs/docker-compose.yml | 22 ++++++++++---------- srcs/docker/bonus/vsftpd/Dockerfile | 4 ++-- srcs/docker/wordpress/Dockerfile | 4 +++- 11 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 .env create mode 100644 secrets/borg/passphrase.txt create mode 100644 secrets/db/root_pass.txt create mode 100644 secrets/db/user_pass.txt create mode 100644 secrets/ftp/pass.txt create mode 100644 secrets/wp/admin_pass.txt diff --git a/.env b/.env new file mode 100644 index 0000000..9d02153 --- /dev/null +++ b/.env @@ -0,0 +1,6 @@ +DB_USER=kanel + +WP_ADMIN=kanel +WP_MAIL=contact@kanel.ovh + +FTP_USER=kanel diff --git a/.gitignore b/.gitignore index 2268cd5..91af465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -*/.env -.env +#*/.env +#.env .direnv -secrets/ +#secrets/ diff --git a/secrets/borg/passphrase.txt b/secrets/borg/passphrase.txt new file mode 100644 index 0000000..e69de29 diff --git a/secrets/db/root_pass.txt b/secrets/db/root_pass.txt new file mode 100644 index 0000000..e69de29 diff --git a/secrets/db/user_pass.txt b/secrets/db/user_pass.txt new file mode 100644 index 0000000..e69de29 diff --git a/secrets/ftp/pass.txt b/secrets/ftp/pass.txt new file mode 100644 index 0000000..e69de29 diff --git a/secrets/wp/admin_pass.txt b/secrets/wp/admin_pass.txt new file mode 100644 index 0000000..e69de29 diff --git a/srcs/configs/wordpress/entry/configure-wp.sh b/srcs/configs/wordpress/entry/configure-wp.sh index c89cd2d..444d8b4 100755 --- a/srcs/configs/wordpress/entry/configure-wp.sh +++ b/srcs/configs/wordpress/entry/configure-wp.sh @@ -16,8 +16,7 @@ if [ -f "${WP_DIR}/wp-config.php" ]; then else echo "Confiruring wordpress..." sleep 1 - echo $TZ - wp --allow-root core config --dbname=${WP_DB_NAME} --dbuser=${WP_DB_USER} --dbpass=${WP_DB_PASS} --dbhost=${WP_DB_HOST} --dbprefix=wp_ --path=${WP_DIR} - wp --allow-root core install --url=https://${WP_URL} --title="${WP_TITLE}" --admin_user=${WP_ADMIN_USER} --admin_password=${WP_ADMIN_PASS} --admin_email=${WP_ADMIN_EMAIL} --path=${WP_DIR} + wp --allow-root core config --dbname=${WP_DB_NAME} --dbuser=${WP_DB_USER} --dbpass=$(getFileEnv WP_DB_PASS) --dbhost=${WP_DB_HOST} --dbprefix=wp_ --path=${WP_DIR} + wp --allow-root core install --url=https://${WP_URL} --title="${WP_TITLE}" --admin_user=${WP_ADMIN_USER} --admin_password=$(getFileEnv WP_ADMIN_PASS) --admin_email=${WP_ADMIN_EMAIL} --path=${WP_DIR} wp option update blog_public ${WP_SEARCH_ENGINE_VISIBILITY} --allow-root fi diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 60b1aa8..687eb15 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -28,15 +28,15 @@ volumes: secrets: ftp-pass: - file: ../secrets/ftp/ftp_pass.txt + file: ../secrets/ftp/pass.txt root-db-pass: - file: ../secrets/db/root_db_pass.txt + file: ../secrets/db/root_pass.txt user-db-pass: - file: ../secrets/db/user_db_pass.txt + file: ../secrets/db/user_pass.txt borg-passphrase: - file: ../secrets/borg/borg_passphrase.txt + file: ../secrets/borg/passphrase.txt wp-admin-pass: - file: ../secrets/wp/wp_admin_pass.txt + file: ../secrets/wp/admin_pass.txt networks: inception: @@ -79,11 +79,11 @@ services: db: condition: service_healthy environment: - - WP_DB_NAME=knl - - WP_DB_USER=kanel + - WP_DB_NAME=${DB_NAME} + - WP_DB_USER=${DB_USER} - WP_DB_PASS_FILE=/run/secrets/user-db-pass - WP_DB_HOST=db - - WP_ADMIN_EMAIL=contact@kanel.ovh + - WP_ADMIN_EMAIL=${WP_MAIL} - WP_ADMIN_USER=kanel - WP_ADMIN_PASS_FILE=/run/secrets/wp-admin-pass - WP_URL=adjoly.42.fr @@ -112,8 +112,8 @@ services: environment: - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/root-db-pass - MYSQL_PASSWORD_FILE=/run/secrets/user-db-pass - - MYSQL_USER="kanel" - - MYSQL_DATABASE="knl" + - MYSQL_USER=${DB_USER} + - MYSQL_DATABASE=${DB_NAME} volumes: - wp-db:/var/lib/mysql restart: unless-stopped @@ -188,7 +188,7 @@ services: networks: - inception environment: - - VSFTPD_USER=kanel + - VSFTPD_USER=${FTP_USER} - VSFTPD_PASS_FILE=/run/secrets/ftp-pass volumes: - wp-site:/var/ftp diff --git a/srcs/docker/bonus/vsftpd/Dockerfile b/srcs/docker/bonus/vsftpd/Dockerfile index fe84de2..13d5e0e 100644 --- a/srcs/docker/bonus/vsftpd/Dockerfile +++ b/srcs/docker/bonus/vsftpd/Dockerfile @@ -11,14 +11,14 @@ COPY cmd /build/cmd COPY internal /build/internal RUN cd /build \ - && go build git.keyzox.me/42_adjoly/inception/cmd/getEnvFile + && go build git.keyzox.me/42_adjoly/inception/cmd/getFileEnv FROM scratch ADD docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz / RUN apk add vsftpd tzdata -COPY --from=builder /build/getEnvFile /bin/getEnvFile +COPY --from=builder /build/getFileEnv /bin/getFileEnv COPY docker/bonus/vsftpd/entry.sh /docker-entrypoint COPY docker/bonus/vsftpd/vsftpd.conf /etc/vsftpd/vsftpd.conf RUN chmod +x /docker-entrypoint diff --git a/srcs/docker/wordpress/Dockerfile b/srcs/docker/wordpress/Dockerfile index f83bc7a..db77683 100644 --- a/srcs/docker/wordpress/Dockerfile +++ b/srcs/docker/wordpress/Dockerfile @@ -10,7 +10,8 @@ COPY cmd /build/cmd COPY internal /build/internal RUN cd /build \ - && go build git.keyzox.me/42_adjoly/inception/cmd/wordpress/entrypoint + && go build git.keyzox.me/42_adjoly/inception/cmd/wordpress/entrypoint \ + && go build git.keyzox.me/42_adjoly/inception/cmd/getFileEnv FROM scratch ADD docker/alpine/alpine-minirootfs-3.21.2-x86_64.tar.gz / @@ -19,6 +20,7 @@ LABEL version="0.1" LABEL maintainer="KeyZox" COPY --from=builder /build/entrypoint /docker-entrypoint +COPY --from=builder /build/getFileEnv /bin/getFileEnv COPY docker/wordpress/www-docker.conf /www-docker.conf RUN set -x \