diff --git a/install-checkerwars.sh b/install-checkerwars.sh index fb4d3c3..7ec1845 100644 --- a/install-checkerwars.sh +++ b/install-checkerwars.sh @@ -8,7 +8,7 @@ fi DEV_ENV="/data/secrets/dev.env" INSTALL_DIR="/data/install" -trap 'echo -e "\033[31mSomething went wrong\033[0m"; exit 1' ERR +trap 'echo -e "\033[31minstall-checkerwars.sh: Something went wrong\033[0m"; exit 1' ERR set -e export DEBIAN_FRONTEND=noninteractive diff --git a/install.sh b/install.sh index 0ba752e..81e66b7 100644 --- a/install.sh +++ b/install.sh @@ -70,7 +70,8 @@ sudo docker compose up -d echo "Install gitea..." cd /data/utils -bash env-gen.sh GITEA__database__PASSWD +GITEA__database__PASSWD=$(pwgen -s 20 1); +bash env-gen.sh GITEA__database__PASSWD $GITEA__database__PASSWD bash init-db.sh gitea $GITEA__database__PASSWD cd /data git clone git@$GIT_SSH_DOMAIN:$GIT_USER/gitea.git @@ -88,6 +89,8 @@ bash env-gen.sh WORDPRESS_DB_PASSWORD $MARIADBPASSWORD bash env-gen.sh WP_ADMIN_PASSWORD cd /data git clone git@$GIT_SSH_DOMAIN:$GIT_USER/mariadb.git +mkdir -p /data/appdata/mariadb +sudo chown -R 1001:1001 /data/appdata/mariadb cd mariadb sudo docker compose up -d @@ -104,7 +107,7 @@ echo "Install blog-wp-install..." cd /data git clone git@$GIT_SSH_DOMAIN:$GIT_USER/blog-wp-install.git cd blog-wp-install -sudo docker bash install.sh +sudo bash install.sh echo "Install tetris..." cd /data