bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed OpenDKIM settings in mail

Browse Source
This commit is contained in:
root 2023-05-26 15:26:34 +00:00
parent ede42f4c31
commit d72960d6ee
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/.env
View File

@ -1,8 +1,8 @@
# Domain name # Domain name
DOMAIN="customer5.fangfree.com" DOMAIN="federated.sh"
# Company name # Company name
COMPANY="Fang Free Inc" COMPANY="FederatedSH Org"
# Country Code (US, HK, GB, JP, etc) # Country Code (US, HK, GB, JP, etc)
COUNTRY="US" COUNTRY="US"

8
bin/gluerecords.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash -x #!/bin/bash
. /federated/lib/functions.sh . /federated/lib/functions.sh
check_gluerecords() { check_gluerecords() {
echo -ne "\n* Checking glue records for $DOMAIN_NEW.." echo -ne "\n* Checking glue records for $DOMAIN_NEW to match $EXTERNALIP.\n"
# Setup DOMAIN variable for domain or subdomain # Setup DOMAIN variable for domain or subdomain
DOMAIN_ARRAY=(${DOMAIN_NEW//./ }) DOMAIN_ARRAY=(${DOMAIN_NEW//./ })
if [ "${#DOMAIN_ARRAY[@]}" -eq "2" ]; then if [ "${#DOMAIN_ARRAY[@]}" -eq "2" ]; then
@ -30,10 +30,10 @@ check_gluerecords() {
CHECK_A2=`dig +noall +authority +additional +norecurse @"$NS_PARENT" NS "$DOMAIN_NEW". | grep A | grep -i ns2.$DOMAIN_NEW | grep $EXTERNALIP` CHECK_A2=`dig +noall +authority +additional +norecurse @"$NS_PARENT" NS "$DOMAIN_NEW". | grep A | grep -i ns2.$DOMAIN_NEW | grep $EXTERNALIP`
[ $? -ne 0 ] && failcheck "Couldn't find glue / authoritative A record ns2.$DOMAIN_NEW to $EXTERNALIP" [ $? -ne 0 ] && failcheck "Couldn't find glue / authoritative A record ns2.$DOMAIN_NEW to $EXTERNALIP"
echo -ne "done." echo -ne "* Glue records are correct!\n\n"
} }
DOMAIN_NEW="customer5.fangfree.com" DOMAIN_NEW="federated.sh"
EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null` EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
[ $? -ne 0 ] && failcheck "Couldn't run dig, dns is not working" [ $? -ne 0 ] && failcheck "Couldn't run dig, dns is not working"
check_gluerecords check_gluerecords

8
lib/mail.sh
View File

@ -65,6 +65,8 @@ SPAMASSASSIN_SPAM_TO_INBOX=1
ENABLE_CLAMAV=0 ENABLE_CLAMAV=0
ENABLE_FAIL2BAN=1 ENABLE_FAIL2BAN=1
ENABLE_POSTGREY=1 ENABLE_POSTGREY=1
ENABLE_OPENDKIM=1
ENBALE_OPENDMARC=1
ONE_DIR=1 ONE_DIR=1
DMS_DEBUG=0 DMS_DEBUG=0
LOG_LEVEL=debug LOG_LEVEL=debug
@ -157,10 +159,14 @@ start_mail() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding
start_service "mail" "nc -z $SERVICE_IP 25 &> /dev/null" start_service "mail" "nc -z $SERVICE_IP 25 &> /dev/null"
# Generate the DKIM DNS key # Generate the DKIM DNS key and setup
docker exec -it mail setup config dkim
docker exec -it mail setup config dkim keysize 2048 domain $DOMAIN &> /dev/null docker exec -it mail setup config dkim keysize 2048 domain $DOMAIN &> /dev/null
[ $? -ne 0 ] && fail "Couldn't generate DKIM record" [ $? -ne 0 ] && fail "Couldn't generate DKIM record"
docker exec -it mail bash -c "setup config dkim domain '$DOMAIN'"
[ $? -ne 0 ] && fail "Couldn't setup DKIM domain"
# Insert the DKIM DNS TXT entry into /federated/apps/pdns container # Insert the DKIM DNS TXT entry into /federated/apps/pdns container
DKIM_RECORD_STRIP=`cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt | sed 's/.*(//'` DKIM_RECORD_STRIP=`cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt | sed 's/.*(//'`
DKIM_RECORD=`echo $DKIM_RECORD_STRIP | sed 's/).*//'` DKIM_RECORD=`echo $DKIM_RECORD_STRIP | sed 's/).*//'`

4
lib/nextcloud.sh
View File

@ -212,7 +212,6 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin
/var/www/html/occ app:enable spreed /var/www/html/occ app:enable spreed
/var/www/html/occ app:enable side_menu /var/www/html/occ app:enable side_menu
/var/www/html/occ app:enable richdocuments /var/www/html/occ app:enable richdocuments
/var/www/html/occ mail:account:create admin admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password
/var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments public_wopi_url /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments public_wopi_url
/var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments wopi_url /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments wopi_url
/var/www/html/occ config:app:set --value ooxml richdocuments doc_format /var/www/html/occ config:app:set --value ooxml richdocuments doc_format
@ -243,6 +242,9 @@ start_nextcloud() {
docker exec -it -u 33 nextcloud /var/www/html/config.sh &> /dev/null docker exec -it -u 33 nextcloud /var/www/html/config.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run config.sh inside /federated/apps/nextcloud container" [ $? -ne 0 ] && fail "Couldn't run config.sh inside /federated/apps/nextcloud container"
# Setup admin email account
docker exec -it -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password"
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."
} }

2
lib/traefik.sh
View File

@ -89,7 +89,7 @@ echo -ne "done."
} }
start_traefik() { start_traefik() {
echo -ne "\n* Starting /federated/apps/dns service.." echo -ne "\n* Starting /federated/apps/traefik service.."
spin & spin &
SPINPID=$! SPINPID=$!