Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cedb8661 authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'ecloud-21.0.9.12' into 'master' 

Add upgrade guide and update images

Closes #99

See merge request !76
parents 4446e51d c5240c97

deployment/questionnaire/questionnaire.dat

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ DBPASS=@@@generate@@@:20@ 
DRIVE_SMTP_PASSWORD=@@@generate@@@:16@

POSTFIXADMIN_SSH_PASSWORD=@@@generate@@@:20@

CREATE_ACCOUNT_PASSWORD=@@@generate@@@:20@

ECLOUD_ACCOUNTS_SECRET=@@@generate@@@:20@



PFA_SUPERADMIN_PASSWORD=1@@@generate@@@:16@2

scripts/base.sh

+3 −0
Original line number Diff line number Diff line
@@ -40,3 +40,6 @@ 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 }')



ECLOUD_ACCOUNTS_SECRET=$(grep ^ECLOUD_ACCOUNTS_SECRET= "$ENVFILE" | awk -F= '{ print $NF }')

scripts/init-repo.sh

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ mkdir -p /mnt/repo-base/volumes/nextcloud/{html,data,log} 
mkdir  "/mnt/repo-base/volumes/nextcloud/html/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/@@@PFDB_DB@@@/$PFDB_DB/g" | \

    sed "s/@@@ECLOUD_ACCOUNTS_SECRET@@@/$ECLOUD_ACCOUNTS_SECRET/g" | \

    sed "s/@@@PFDB_USR@@@/$PFDB_USR/g" | sed "s/@@@DBPASS@@@/$PFDB_DBPASS/g" > \

    "/mnt/repo-base/volumes/nextcloud/html/config/config.php"

chown -R www-data: "/mnt/repo-base/volumes/nextcloud/"

scripts/postinstall.sh

+5 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enabl 
docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable contacts

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable news

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable email-recovery

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud_drop_account

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-accounts

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-theme-helper

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:enable ecloud-launcher

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:disable firstrunwizard
@@ -57,9 +57,9 @@ docker-compose exec -T --user www-data nextcloud php /var/www/html/occ app:insta 
docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set integrity.check.disabled --value='true' --type=boolean



echo "Installing custom ecloud drop account plugin"

# Add WELCOME_SECRET from .env file as a system config value, to be used by our ecloud_drop_account plugin

# Add WELCOME_SECRET from .env file as a system config value, to be used by our ecloud-accounts plugin

docker-compose exec -T --user www-data nextcloud php occ config:system:set e_welcome_secret --value="$WELCOME_SECRET"

# Add VHOST_ACCOUNTS from .env file as a system config value, to be used by our ecloud_drop_account plugin

# Add VHOST_ACCOUNTS from .env file as a system config value, to be used by our ecloud-accounts plugin

docker-compose exec -T --user www-data nextcloud php occ config:system:set e_welcome_domain --value="welcome.$DOMAIN"



# Add missing indices
@@ -102,13 +102,14 @@ echo "Setting the right domain in welcome templates" 
docker-compose exec -T welcome find /var/www/html/invite_template/ -type f -exec sed -i "s/ecloud\.global/$DOMAIN/g" {} \;

docker-compose exec -T welcome find /var/www/html/invite_template/ -type f -exec sed -i "s/e\.email/$DOMAIN/g" {} \;

docker-compose exec -T welcome find /var/www/html/ -type f -name '*.html' -exec sed -i "s/e\.email/$DOMAIN/g" {} \;

docker-compose exec -T welcome find /var/www/html/account_created_templates/ -type f -exec sed -i "s/ecloud\.global/$DOMAIN/g" {} \;



# display DKIM DNS setup info/instructions to the user

echo -e "\n\n\n"

echo -e "Please add the following records to your domain's DNS configuration:\n"

find /mnt/repo-base/volumes/mail/dkim/ -maxdepth 1 -mindepth 1 -type d | while read line; do

    DOMAIN=$(basename $line)

    echo "  - DKIM record (TXT) for $DOMAIN:" && cat $line/mail.public.key

    echo "  - DKIM record (TXT) for $DOMAIN:" &&  sed $'N;s/"\\n\t"//g' $line/mail.public.key

done



echo "================================================================================================================================="

templates/docker-compose/docker-compose.yml

+7 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ services: 
      - /mnt/repo-base/volumes/mysql/db/data:/var/lib/mysql

      - /mnt/repo-base/config/mariadb/:/etc/mysql/conf.d/:ro

  redis:

    image: redis:6.0-alpine

    image: redis:6.2-alpine

    container_name: redis

    restart: always

    networks:
@@ -92,7 +92,7 @@ services: 
      - /mnt/repo-base/volumes/redis/tmp:/tmp/redis



  welcome:

    image: registry.gitlab.e.foundation/e/infra/docker-welcome:2.1.3

    image: registry.gitlab.e.foundation/e/infra/docker-welcome:2.5.0

    container_name: welcome

    environment:

      - DOMAINS=${VHOSTS_ACCOUNTS}
@@ -108,6 +108,9 @@ services: 
      - SMTP_HOST=${SMTP_HOST}

      - SMTP_FROM=${SMTP_FROM}

      - SMTP_PW=${SMTP_PW}

      - WELCOME_SMTP_FROM=${SMTP_FROM}

      - WELCOME_SMTP_PW=${SMTP_PW}

      - ECLOUD_ACCOUNTS_SECRET=${ECLOUD_ACCOUNTS_SECRET}

      - SMTP_PORT=587

      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}

      - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
@@ -123,7 +126,7 @@ services: 
      - "${DOMAIN}:${NC_HOST_IP}"



  nextcloud:

    image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud:selfhost

    image: registry.gitlab.e.foundation/e/infra/ecloud/nextcloud/selfhost:selfhost-21-0-9-12

    container_name: nextcloud

    restart: always

    networks:
@@ -164,7 +167,7 @@ services: 
      - /mnt/repo-base/config/automx/automx.conf:/etc/automx.conf



  nginx:

    image: nginx:1.19-alpine

    image: nginx:1.20-alpine

    container_name: nginx

    restart: unless-stopped

    networks: