diff --git a/docker-compose.yml b/docker-compose.yml index 517fadd6d43b7145738711d90a647a5c06c5175d..bac8b1b26b95da036e8dd7b5942ded983481047e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,8 +36,6 @@ services: - MYSQL_HOST=db - MYSQL_USER=root - MYSQL_PASSWORD - - NEXTCLOUD_ADMIN_PASSWORD - - NEXTCLOUD_ADMIN_USER=indie networks: - back db: diff --git a/env-sample b/env-sample index 31d70f8cf945497df36347d4b481d2de39238063..e148ae621ff6b1b60953f6ed92dd7b31f126c11d 100644 --- a/env-sample +++ b/env-sample @@ -1,5 +1,4 @@ MYSQL_ROOT_PASSWORD= MYSQL_PASSWORD= -NEXTCLOUD_ADMIN_PASSWORD= SUBNET= diff --git a/scripts/install b/scripts/install index d6efcb25da5316ab3309550297cebf1d297a7872..0848fb3ad2645a6f8d5fffe2b5baa785b7e0c56b 100755 --- a/scripts/install +++ b/scripts/install @@ -1,14 +1,12 @@ #!/bin/bash -eux MYSQL_ROOT_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs` -NEXTCLOUD_ADMIN_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs` var=$(for folder in `ls /data/domains`; do cat /data/domains/$folder/.env | grep SUBNET | cut -d"=" -f2; done | sort | tail -n1) SUBNET=$(($var +1)) echo "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" > .env echo "MYSQL_PASSWORD=${MYSQL_ROOT_PASSWORD}" >> .env -echo "NEXTCLOUD_ADMIN_PASSWORD={NEXTCLOUD_ADMIN_PASSWORD}" >> .env echo "SUBNET=${SUBNET}" >> .env cat > mail.config.php <<EOF