Loading scripts/base.sh +1 −0 Original line number Diff line number Diff line Loading @@ -36,6 +36,7 @@ SMTP_PW=$(grep ^SMTP_PW= "$ENVFILE" | awk -F= '{ print $NF }') SMTP_HOST=$(grep ^SMTP_HOST= "$ENVFILE" | awk -F= '{ print $NF }') MYSQL_ROOT_PASSWORD=$(grep ^MYSQL_ROOT_PASSWORD= "$ENVFILE" | awk -F= '{ print $NF }') # the encoding/decoding is taken from here: https://stackoverflow.com/questions/296536/how-to-urlencode-data-for-curl-command/10660730#10660730 urlencode() { Loading scripts/generate-signup-link.sh +4 −2 Original line number Diff line number Diff line Loading @@ -24,6 +24,8 @@ echo "$EMAIL:$AUTH_SECRET" >> /mnt/repo-base/volumes/accounts/auth.file SIGNUP_URL="https://welcome.$DOMAIN/?authmail=$(urlencode "$EMAIL")&authsecret=$AUTH_SECRET" echo "The new user can sign up now at $SIGNUP_URL" echo -e "Subject:Signup for $DOMAIN echo -e "to:$EMAIL from:drive@$DOMAIN subject:Signup for $DOMAIN You can now sign up for your $DOMAIN account at $SIGNUP_URL" | \ docker-compose exec -T eelomailserver sendmail -f "drive@$DOMAIN" -t "$EMAIL" docker exec -i $(docker-compose ps -q eelomailserver) sendmail -t scripts/init-repo.sh +1 −4 Original line number Diff line number Diff line Loading @@ -173,10 +173,7 @@ fi # create nextcloud config mkdir -p "/mnt/repo-base/volumes/nextcloud/config/" cat /mnt/repo-base/templates/nextcloud/config.php | sed "s/@@@DOMAIN@@@/$DOMAIN/g" | \ sed "s/@@@DRIVE_SMTP_PASSWORD@@@/$DRIVE_SMTP_PASSWORD/g" | sed "s/@@@MYSQL_PASSWORD_NC@@@/$MYSQL_PASSWORD_NC/g" | \ sed "s/@@@MYSQL_DATABASE_NC@@@/$MYSQL_DATABASE_NC/g" | sed "s/@@@MYSQL_USER_NC@@@/$MYSQL_USER_NC/g" | \ sed "s/@@@PFDB_DBPASS@@@/$PFDB_DBPASS/g" > \ "/mnt/repo-base/volumes/nextcloud/config/config.php" sed "s/@@@DRIVE_SMTP_PASSWORD@@@/$DRIVE_SMTP_PASSWORD/g" > "/mnt/repo-base/volumes/nextcloud/config/config.php" chown www-data:www-data "/mnt/repo-base/volumes/nextcloud/" -R # Login to /e/ registry | not necessary when going public Loading scripts/postinstall.sh +1 −1 Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ echo "Installing nextcloud plugins" docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install calendar docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install tasks docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install notes docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install user_backend_sql_raw docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install user_external docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install rainloop docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:app:set rainloop rainloop-autologin --value 1 Loading templates/docker-compose/docker-compose-base.yml +3 −9 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ services: - redis postfixadmin: image: registry.gitlab.e.foundation:5000/e/infra/docker-postfixadmin:0.1.2 image: registry.gitlab.e.foundation:5000/e/infra/docker-postfixadmin:0.1.3 container_name: postfixadmin domainname: ${DOMAIN} hostname: mail Loading @@ -46,6 +46,7 @@ services: - serverbase environment: - DBPASS=${DBPASS} - DOMAIN=${DOMAIN} - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD} depends_on: - eelomailserver Loading Loading @@ -103,13 +104,6 @@ services: nextcloud: image: nextcloud:15.0.10 container_name: nextcloud environment: - MYSQL_DATABASE=${MYSQL_DATABASE_NC} - MYSQL_USER=${MYSQL_USER_NC} - MYSQL_PASSWORD=${MYSQL_PASSWORD_NC} - MYSQL_HOST=mariadb - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER} - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD} restart: always networks: - serverbase Loading @@ -136,7 +130,7 @@ services: - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf create-account: image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:0.1.6 image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:trigger-nextcloud-account container_name: create-account restart: always environment: Loading Loading
scripts/base.sh +1 −0 Original line number Diff line number Diff line Loading @@ -36,6 +36,7 @@ SMTP_PW=$(grep ^SMTP_PW= "$ENVFILE" | awk -F= '{ print $NF }') SMTP_HOST=$(grep ^SMTP_HOST= "$ENVFILE" | awk -F= '{ print $NF }') MYSQL_ROOT_PASSWORD=$(grep ^MYSQL_ROOT_PASSWORD= "$ENVFILE" | awk -F= '{ print $NF }') # the encoding/decoding is taken from here: https://stackoverflow.com/questions/296536/how-to-urlencode-data-for-curl-command/10660730#10660730 urlencode() { Loading
scripts/generate-signup-link.sh +4 −2 Original line number Diff line number Diff line Loading @@ -24,6 +24,8 @@ echo "$EMAIL:$AUTH_SECRET" >> /mnt/repo-base/volumes/accounts/auth.file SIGNUP_URL="https://welcome.$DOMAIN/?authmail=$(urlencode "$EMAIL")&authsecret=$AUTH_SECRET" echo "The new user can sign up now at $SIGNUP_URL" echo -e "Subject:Signup for $DOMAIN echo -e "to:$EMAIL from:drive@$DOMAIN subject:Signup for $DOMAIN You can now sign up for your $DOMAIN account at $SIGNUP_URL" | \ docker-compose exec -T eelomailserver sendmail -f "drive@$DOMAIN" -t "$EMAIL" docker exec -i $(docker-compose ps -q eelomailserver) sendmail -t
scripts/init-repo.sh +1 −4 Original line number Diff line number Diff line Loading @@ -173,10 +173,7 @@ fi # create nextcloud config mkdir -p "/mnt/repo-base/volumes/nextcloud/config/" cat /mnt/repo-base/templates/nextcloud/config.php | sed "s/@@@DOMAIN@@@/$DOMAIN/g" | \ sed "s/@@@DRIVE_SMTP_PASSWORD@@@/$DRIVE_SMTP_PASSWORD/g" | sed "s/@@@MYSQL_PASSWORD_NC@@@/$MYSQL_PASSWORD_NC/g" | \ sed "s/@@@MYSQL_DATABASE_NC@@@/$MYSQL_DATABASE_NC/g" | sed "s/@@@MYSQL_USER_NC@@@/$MYSQL_USER_NC/g" | \ sed "s/@@@PFDB_DBPASS@@@/$PFDB_DBPASS/g" > \ "/mnt/repo-base/volumes/nextcloud/config/config.php" sed "s/@@@DRIVE_SMTP_PASSWORD@@@/$DRIVE_SMTP_PASSWORD/g" > "/mnt/repo-base/volumes/nextcloud/config/config.php" chown www-data:www-data "/mnt/repo-base/volumes/nextcloud/" -R # Login to /e/ registry | not necessary when going public Loading
scripts/postinstall.sh +1 −1 Original line number Diff line number Diff line Loading @@ -28,7 +28,7 @@ echo "Installing nextcloud plugins" docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install calendar docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install tasks docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install notes docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install user_backend_sql_raw docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install user_external docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:install rainloop docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:app:set rainloop rainloop-autologin --value 1 Loading
templates/docker-compose/docker-compose-base.yml +3 −9 Original line number Diff line number Diff line Loading @@ -37,7 +37,7 @@ services: - redis postfixadmin: image: registry.gitlab.e.foundation:5000/e/infra/docker-postfixadmin:0.1.2 image: registry.gitlab.e.foundation:5000/e/infra/docker-postfixadmin:0.1.3 container_name: postfixadmin domainname: ${DOMAIN} hostname: mail Loading @@ -46,6 +46,7 @@ services: - serverbase environment: - DBPASS=${DBPASS} - DOMAIN=${DOMAIN} - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD} depends_on: - eelomailserver Loading Loading @@ -103,13 +104,6 @@ services: nextcloud: image: nextcloud:15.0.10 container_name: nextcloud environment: - MYSQL_DATABASE=${MYSQL_DATABASE_NC} - MYSQL_USER=${MYSQL_USER_NC} - MYSQL_PASSWORD=${MYSQL_PASSWORD_NC} - MYSQL_HOST=mariadb - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER} - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD} restart: always networks: - serverbase Loading @@ -136,7 +130,7 @@ services: - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf create-account: image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:0.1.6 image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:trigger-nextcloud-account container_name: create-account restart: always environment: Loading