From 584f9cb549785c9221b08ab5120559c6fe0ec28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:21:52 +0200 Subject: [PATCH] cleaning --- conf/.env | 4 ++-- scripts/_common.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/.env b/conf/.env index f95d36b..2957ef8 100644 --- a/conf/.env +++ b/conf/.env @@ -10,8 +10,8 @@ SSH_SERVER_FINGERPRINT_RSA=__RSA_KEY__ SSH_SERVER_FINGERPRINT_ED25519=__ED25519_KEY__ SSH_SERVER_FINGERPRINT_ECDSA=__ECDSA_KEY__ # SMTP's variables -MAIL_SMTP_FROM=borgwarehouse@__DOMAIN__ -MAIL_SMTP_HOST=localhost +MAIL_SMTP_FROM=borgwarehouse@__MAIN_DOMAIN__ +MAIL_SMTP_HOST=__MAIN_DOMAIN__ MAIL_SMTP_PORT=25 MAIL_SMTP_LOGIN=__APP__ MAIL_SMTP_PWD=__MAIL_PWD__ diff --git a/scripts/_common.sh b/scripts/_common.sh index b4d1a2f..b1923cd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,6 +6,7 @@ nodejs_version=18 ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+") +main_domain=$(cat /etc/yunohost/current_host) rsa_key=$(ssh-keygen -lf /etc/ssh/ssh_host_rsa_key | awk '{print $2}') ed25519_key=$(ssh-keygen -lf /etc/ssh/ssh_host_ed25519_key | awk '{print $2}')