From 99917f23a7ac35f16e4c915e91a11a65b724db0f Mon Sep 17 00:00:00 2001 From: Valentin Date: Mon, 11 Nov 2024 20:40:42 +0100 Subject: [PATCH] debug --- bin/add-site/install_directus.sh | 8 ++++---- bin/first_install.sh | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/add-site/install_directus.sh b/bin/add-site/install_directus.sh index fe41f15..f076d21 100644 --- a/bin/add-site/install_directus.sh +++ b/bin/add-site/install_directus.sh @@ -1,7 +1,7 @@ #!/bin/bash -mkdir /home/$username/cms.$DOMAIN_NAME -cp assets/directus.docker-compose.yml /home/$username/cms.$DOMAIN_NAME/docker-compose.yml -cp assets/.env.example /home/$username/cms.$DOMAIN_NAME/.env +mkdir "/home/${username}/cms.${DOMAIN_NAME}" +cp assets/directus.docker-compose.yml "/home/${username}/cms.${DOMAIN_NAME}/docker-compose.yml" +cp assets/.env.example "/home/${username}/cms.${DOMAIN_NAME}/.env" docker network create web -docker compose -f /home/$username/cms.$DOMAIN_NAME/docker-compose.yml up -d \ No newline at end of file +docker compose -f "/home/${username}/cms.${DOMAIN_NAME}/docker-compose.yml" up -d \ No newline at end of file diff --git a/bin/first_install.sh b/bin/first_install.sh index 16b8861..5c57e37 100644 --- a/bin/first_install.sh +++ b/bin/first_install.sh @@ -41,11 +41,15 @@ else echo "Docker is installed." fi +if [[ -z "$username" ]]; then + username=$(getent passwd 1001 | cut -d: -f1) +fi + # Check if a Caddy container is running if docker ps --filter "ancestor=caddy" --format '{{.Names}}' | grep -q .; then echo "A Caddy container is running." else - mkdir /home/$username/caddy - cp assets/caddy.docker-compose.yml /home/$username/caddy/docker-compose.yml - docker compose -f /home/$username/cms.$DOMAIN_NAME/docker-compose.yml up -d + mkdir "/home/${username}/caddy" + cp assets/caddy.docker-compose.yml "/home/${username}/caddy/docker-compose.yml" + docker compose -f "/home/${username}/cms.${DOMAIN_NAME}/docker-compose.yml" up -d fi \ No newline at end of file