fsfe-system-hackers/fsfe-cd
16
2
Fork 3
Code Issues 36 Pull Requests 18 Projects Wiki Activity

Change log emails (to and from)
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details

Browse Source 
Changed the from header to indicate the part of the system that the
that the email comes from and now send everything to `logs@fsfe.org`
which redirects to `syshackers@fsfe.org` and thus lands immediately in
the System Administration mailbox.
This commit is contained in:
Linus Sehn
2023-06-23 08:52:48 +02:00
parent d327b29706
commit e48215abf0
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker-compose.production.yml
View File

@@ -59,8 +59,8 @@ services:
MAIL_SERVER: "mail.fsfe.org"
MAIL_HELO_HOST: "cont1.noris.fsfeurope.org"
MAIL_DEFAULT_RECEIVERS: "reinhard,mk,linus,eal,alex.sander"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "contact@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-back@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
CMD_PASSPHRASE: "${CMD_PASSPHRASE}"
OIDCP_URL: "https://id.fsfe.org/userinfo"
DATABASE_URL: "postgresql://fsfe:${POSTGRES_PASSWORD}@10.200.64.11/fsfe"
@@ -91,8 +91,8 @@ services:
environment:
MAIL_SERVER: "mail.fsfe.org"
MAIL_DEFAULT_SENDER: "admin@fsfe.org"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "contact@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-auth@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
CLIENT_ID: "fsfe-cd-front.fsfe.org"
CLIENT_SECRET: "${JWT_SECRET}"
CLIENT_REDIRECT_URI: "https://my.fsfe.org/code-exchange"
@@ -133,8 +133,8 @@ services:
PREFERRED_URL_SCHEME: "https"
RATELIMIT_DEFAULT: "2 per second, 10 per minute, 20 per hour"
MAIL_SERVER: "mail.fsfe.org"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "contact@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-front@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
VALIDATE_EMAIL_HELO: "cont1.noris.fsfeurope.org"
VALIDATE_EMAIL_FROM: "contact@fsfe.org"
OIDCP_URL: "https://id.fsfe.org/"

12
docker-compose.staging.yml
View File

@@ -94,8 +94,8 @@ services:
MAIL_SERVER: "mail.fsfe.org"
MAIL_DEFAULT_RECEIVERS: "alice"
MAIL_HELO_HOST: "cont2.noris.fsfeurope.org"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "linus@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-back-staging@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
OIDCP_URL: "https://staging.id.fsfe.org/userinfo"
OPENPGP_CA_URL: "http://fsfe-cd-opgpca-restd:8000"
DATABASE_URL: "postgresql://fsfe:${SECRET_KEY}@fsfe-cd-db/fsfe-staging"
@@ -125,8 +125,8 @@ services:
environment:
MAIL_SERVER: "mail.fsfe.org"
MAIL_DEFAULT_SENDER: "admin@fsfe.org"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "linus@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-auth-staging@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
CLIENT_ID: "fsfe-cd-front-staging.fsfe.org"
CLIENT_SECRET: "${JWT_SECRET_STAGING}"
CLIENT_REDIRECT_URI: "https://staging.my.fsfe.org/code-exchange"
@@ -163,8 +163,8 @@ services:
PREFERRED_URL_SCHEME: "https"
RATELIMIT_DEFAULT: "2 per second, 10 per minute, 20 per hour"
MAIL_SERVER: "mail.fsfe.org"
LOG_EMAIL_FROM: "contact@fsfe.org"
LOG_EMAIL_TO: "contact@fsfe.org"
LOG_EMAIL_FROM: "fsfe-cd-front-staging@fsfe.org"
LOG_EMAIL_TO: "logs@fsfe.org"
VALIDATE_EMAIL_HELO: "cont2.noris.fsfeurope.org"
VALIDATE_EMAIL_FROM: "contact@fsfe.org"
OIDCP_URL: "https://staging.id.fsfe.org/"