From 3f07b7bcd049ce7fe96966dd7a15b6744f9cdcff Mon Sep 17 00:00:00 2001 From: "Kasper D. Fischer" Date: Fri, 21 Mar 2025 12:39:10 +0100 Subject: [PATCH] [minor] update Dockerfile and parameters.yaml - In the Dockerfile, added a new parameter "-parfile" with value "conf/parameters.yaml" to the CMD command in survBot.py. - In parameters.yaml, made changes to the EMAIL section: - Added comments explaining how to specify mail server and credentials. - Added auth_type field with value "SSL". - Updated port field to 465 for SSL. - Updated user and password fields to read from environment variables or docker secrets. - Added comments explaining how to specify mail recipients, sender, and blacklists. - Moved location of simulate_fail.json to conf/simulate_fail.json for easier Docker integration --- Dockerfile | 2 +- parameters.yaml | 17 +++++++++++------ survBot.py | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e37f11f..14aa895 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ RUN apt update && apt install -y bind9-host iputils-ping COPY . . -CMD [ "python", "./survBot.py", "-html", "www" ] +CMD [ "python", "./survBot.py", "-html", "www", "-parfile", "conf/parameters.yaml" ] diff --git a/parameters.yaml b/parameters.yaml index fcf609f..1be3d16 100644 --- a/parameters.yaml +++ b/parameters.yaml @@ -137,13 +137,18 @@ html_logo: "logo.png" # E-mail notifications EMAIL: - mailserver: "smtp.rub.de" # mail server - port: 465 # mail port + # specify mail server and credentials + # port, auth_type, user and password are only required if mailserver is not set to "localhost" + # user and password can be set to "ENV" or "DOCKER" to read from environment variables or docker secrets + mailserver: "smtp.rub.de" # mail server + auth_type: "SSL" # mail authentication type, can be "SSL", "TLS" or "None" + port: 465 # mail port, default 465 for SSL, 587 for TLS user: "DOCKER" # mail user, read from environment variable if set to "ENV" or from docker secret if set to "DOCKER" password: "DOCKER" # mail password, read from environment variable if set to "ENV" or from docker secret if set to "DOCKER" + # specify mail recipients, sender and blacklists addresses: ["marcel.paffrath@rub.de", "kasper.fischer@rub.de"] # list of mail addresses for info mails - sender: "RUB SeisObs " # mail sender - stations_blacklist: [] # do not send emails for specific stations - networks_blacklist: [] # do not send emails for specific network + sender: "RUB SeisObs " # mail sender + stations_blacklist: [] # do not send emails for specific stations + networks_blacklist: [] # do not send emails for specific network # specify recipients for single stations in a yaml: key = email-address, val = station list (e.g. [1Y.GR01, 1Y.GR02]) - external_mail_list: "mailing_list.yaml" + external_mail_list: "conf/mailing_list.yaml" diff --git a/survBot.py b/survBot.py index 2d5fef5..53357d7 100755 --- a/survBot.py +++ b/survBot.py @@ -704,7 +704,7 @@ class StationQC(object): return 'active' return False - def _simulated_error_check(self, key, fname='simulate_fail.json'): + def _simulated_error_check(self, key, fname='conf/simulate_fail.json'): if not os.path.isfile(fname): return with open(fname) as fid: