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

Commit c2bd1167 authored by Sylvain Manceau's avatar Sylvain Manceau
Browse files

NC26 fresh attempt 1

parent 58adfa52

scripts/init-repo.sh

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ echo "AUTODISCOVER_AM_UUID=$UUID1" >> "$ENVFILE" 
echo "AUTODISCOVER_AP_UUID=$UUID2" >> "$ENVFILE"



# Configure MTA-STS

cat templates/mta-sts/mta-sts.txt | sed "s/@@@SMTP_HOST@@@/$SMTP_HOST/g" > "config/mta-sts/.well-known/mta-sts.txt"

cat templates/mta-sts/mta-sts.txt | sed "s/@@@SMTP_HOST@@@/mail.$DOMAIN/g" > "config/mta-sts/.well-known/mta-sts.txt"

chown -R www-data:www-data "config/mta-sts/"



# Configure rspamd whitelist
@@ -169,7 +169,7 @@ echo "NC_HOST_IP=$IP" >> "$ENVFILE" 
bash scripts/ssl-renew.sh



# verify LE status

CTR_LE=$(find config/letsencrypt/certstore/live/mail.$DOMAIN/privkey.pem config/letsencrypt/certstore/live/spam.$DOMAIN/privkey.pem config/letsencrypt/certstore/live/welcome.$DOMAIN/privkey.pem 2>/dev/null| wc -l)

CTR_LE=$(find config/letsencrypt/certstore/live/mail.$DOMAIN/privkey.pem config/letsencrypt/certstore/live/spam.$DOMAIN/privkey.pem config/letsencrypt/certstore/live/welcome.$DOMAIN/privkey.pem config/letsencrypt/certstore/live/mta-sts.$DOMAIN/privkey.pem 2>/dev/null| wc -l)

CTR_AC_LE=$(echo "$VIRTUAL_HOST" | tr "," "\n" | while read CURDOMAIN; do find config/letsencrypt/certstore/live/$CURDOMAIN/privkey.pem 2>/dev/null | grep $CURDOMAIN && echo found || echo missing; done  | grep missing | wc  -l)



if [ "$CTR_LE$CTR_AC_LE" = "${NUM_CERTIFICATES}0" ]

scripts/postinstall.sh

+4 −1
Original line number Diff line number Diff line
@@ -51,10 +51,13 @@ 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 selfhost-theme-helper

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

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

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

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

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

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

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

docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:app:set snappymail snappymail-autologin-with-email --value 1

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 drop_account



docker-compose exec -T --user www-data nextcloud php /var/www/html/occ config:system:set integrity.check.disabled --value='true' --type=boolean