From 078c0e545e45b163e5ac3fa8b896e33cd838b885 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 10 Nov 2023 13:10:47 +0000 Subject: [PATCH] Converted all services to use fcore for smtp --- lib/baserow.sh | 2 +- lib/bookstack.sh | 6 +++--- lib/castopod.sh | 2 +- lib/freescout.sh | 2 +- lib/gitea.sh | 2 +- lib/listmonk.sh | 2 +- lib/matrix.sh | 2 +- lib/panel.sh | 4 ++-- lib/vaultwarden.sh | 2 +- lib/wordpress.sh | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/baserow.sh b/lib/baserow.sh index 7bf6933..a1ca44c 100644 --- a/lib/baserow.sh +++ b/lib/baserow.sh @@ -57,7 +57,7 @@ EMAIL_SMTP=True FROM_EMAIL=baserow@$DOMAIN EMAIL_SMTP_HOST=mail.$DOMAIN EMAIL_SMTP_PORT=587 -EMAIL_SMTP_USER=admin +EMAIL_SMTP_USER=fcore EMAIL_SMTP_PASSWORD=$ADMINPASS EMAIL_SMTP_USE_TLS=True EOF diff --git a/lib/bookstack.sh b/lib/bookstack.sh index fcb0b75..6d7278b 100644 --- a/lib/bookstack.sh +++ b/lib/bookstack.sh @@ -58,11 +58,11 @@ DB_PORT=3306 DB_DATABASE=bookstack QUEUE_CONNECTION=database #MAIL_DRIVER=smtp -MAIL_FROM=admin@$DOMAIN -MAIL_FROM_NAME=admin +MAIL_FROM=bookstack@$DOMAIN +MAIL_FROM_NAME=bookstack MAIL_HOST=mail.$DOMAIN MAIL_PORT=587 -MAIL_USERNAME=admin +MAIL_USERNAME=fcore MAIL_PASSWORD=$ADMINPASS MAIL_ENCRYPTION=TLS EOF diff --git a/lib/castopod.sh b/lib/castopod.sh index 4edee66..f2e7a0c 100644 --- a/lib/castopod.sh +++ b/lib/castopod.sh @@ -56,7 +56,7 @@ CP_BASEURL="https://castopod.$DOMAIN" CP_ANALYTICS_SALT="$CP_ANALYTICS_SALT" CP_EMAIL_SMTP_HOST="mail.$DOMAIN" CP_EMAIL_FROM="castopod@$DOMAIN" -CP_EMAIL_SMTP_USERNAME="admin" +CP_EMAIL_SMTP_USERNAME="fcore" CP_EMAIL_SMTP_PASSWORD=$ADMINPASS CP_EMAIL_SMTP_PORT="587" CP_EMAIL_SMTP_CRYPTO="tls" diff --git a/lib/freescout.sh b/lib/freescout.sh index f869bca..c1c808e 100644 --- a/lib/freescout.sh +++ b/lib/freescout.sh @@ -60,7 +60,7 @@ ENABLE_SSL_PROXY=TRUE DISPLAY_ERRORS=FALSE CONTAINER_ENABLE_MONITORING=FALSE SMTP_HOST=mail.$DOMAIN -SMTP_USER=admin +SMTP_USER=fcore SMTP_PASS=$ADMINPASS SMTP_TLS=true SMTP_PORT=587 diff --git a/lib/gitea.sh b/lib/gitea.sh index 5629046..721fa32 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -70,7 +70,7 @@ GITEA__mailer__MAILER_TYPE=smtp GITEA__mailer__SMTP_PORT=587 GITEA__mailer__HOST=mail.$DOMAIN GITEA__mailer__IS_TLS_ENABLED=true -GITEA__mailer__USER=admin +GITEA__mailer__USER=fcore GITEA__mailer__PASSWD=$ADMINPASS GITEA__security__INSTALL_LOCK=true GITEA__server__ROOT_URL=https://gitea.$DOMAIN diff --git a/lib/listmonk.sh b/lib/listmonk.sh index 700130b..a3f277e 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -78,7 +78,7 @@ start_listmonk() { # Change app.root_url and other settings to our domain docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null docker exec postgresql psql -U listmonk -c "update settings set value='\"listmonk \"' where key='app.from_email'" &> /dev/null - docker exec postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"admin\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null + docker exec postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"fcore\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null # Start service with command to make sure it's up before proceeding start_service "listmonk" "nc -z 172.99.0.21 9000 &> /dev/null" "8" diff --git a/lib/matrix.sh b/lib/matrix.sh index deffd1c..1d9e558 100644 --- a/lib/matrix.sh +++ b/lib/matrix.sh @@ -80,7 +80,7 @@ database: email: smtp_host: "mail.$DOMAIN" smtp_port: 587 - smtp_user: "admin" + smtp_user: "fcore" smtp_pass: "$ADMINPASS" force_tls: true # require_transport_security: true diff --git a/lib/panel.sh b/lib/panel.sh index 025dee0..a36b928 100644 --- a/lib/panel.sh +++ b/lib/panel.sh @@ -65,9 +65,9 @@ SITE_LOGIN_LDAP_ATTRIBUTE=mail SITE_LOGIN_FIELD_LABEL="Email Address" SITE_NAME=$COMPANY User Manager SMTP_HOSTNAME=mail.$DOMAIN -SMTP_USERNAME=admin +SMTP_USERNAME=fcore SMTP_PASSWORD=$ADMINPASS -EMAIL_FROM_ADDRESS=admin@$DOMAIN +EMAIL_FROM_ADDRESS=panel@$DOMAIN #SMTP_USE_TLS=true NO_HTTPS=true EOF diff --git a/lib/vaultwarden.sh b/lib/vaultwarden.sh index 5bba239..8d8afde 100644 --- a/lib/vaultwarden.sh +++ b/lib/vaultwarden.sh @@ -52,7 +52,7 @@ SMTP_HOST=mail.$DOMAIN SMTP_FROM=vaultwarden@$DOMAIN SMTP_PORT=587 SMTP_SECURITY=starttls -SMTP_USERNAME=admin +SMTP_USERNAME=fcore SMTP_PASSWORD=$ADMINPASS EOF chmod 600 /federated/apps/vaultwarden/.env diff --git a/lib/wordpress.sh b/lib/wordpress.sh index 038e079..1ed606a 100644 --- a/lib/wordpress.sh +++ b/lib/wordpress.sh @@ -62,7 +62,7 @@ WORDPRESS_DATABASE_NAME=wordpress WORDPRESS_DATABASE_PASSWORD=$WORDPRESS_SECRET WORDPRESS_SMTP_HOST=mail.$DOMAIN WORDPRESS_SMTP_PORT=587 -WORDPRESS_SMTP_USER=admin@$DOMAIN +WORDPRESS_SMTP_USER=fcore@$DOMAIN WORDPRESS_SMTP_PASSWORD=$ADMINPASS EOF chmod 600 /federated/apps/wordpress/.env