Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Authenticate mails sent by MaMpf #590

Merged
merged 8 commits into from
Mar 19, 2024
Merged

Authenticate mails sent by MaMpf #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f636d0f
Warn about too long GitHub commit messages (#586)
Splines Jan 11, 2024
eb9484a
Fix comment status (#585)
Splines Jan 16, 2024
475fc04
Migrate `unread_comments` flag (fix inconsistencies) (#587)
Splines Jan 17, 2024
92d48d4
Use `warn` log level for migration (#588)
Splines Jan 19, 2024
aeeb53c
Authenticate mails sent by MaMpf
Splines Feb 12, 2024
2bb15cd
Fix mails comment
Splines Feb 12, 2024
f40080e
Add `nil` env fallback due to #542
Splines Feb 13, 2024
4d066c3
Merge branch 'dev' into feature/mails-auth
Splines Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
config.action_mailer.smtp_settings = {
address: ENV.fetch("MAILSERVER"),
port: 25,
domain: ENV.fetch("MAILSERVER")
user_name: ENV.fetch("MAMPF_EMAIL_USERNAME"),
password: ENV.fetch("MAMPF_EMAIL_PASSWORD")
}

# Ignore bad email addresses and do not raise email delivery errors.
Expand Down
4 changes: 3 additions & 1 deletion docker/production/docker.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MUESLI_SERVER=https://muesli.mathi.uni-heidelberg.de
ERDBEERE_API=https://erdbeere.mathi.uni-heidelberg.de/api/v1
MEMCACHED_SERVER=cache

# Email is send using a mailserver without authentication. Specify how to connect here
# Email
[email protected]
MAILSERVER=mail.mathi.uni-heidelberg.de
[email protected]
Expand All @@ -22,6 +22,8 @@ IMAPSERVER=mail.mathi.uni-heidelberg.de
PROJECT_EMAIL_USERNAME=creativeusername
PROJECT_EMAIL_PASSWORD=secretsecret
PROJECT_EMAIL_MAILBOX="Other Users/mampf"
MAMPF_EMAIL_USERNAME=secret
MAMPF_EMAIL_PASSWORD=secret

# Due to CORS constraints, some urls are proxied to the media server
DOWNLOAD_LOCATION=https://mampf.mathi.uni-heidelberg.de/mediaforward
Expand Down