-
Notifications
You must be signed in to change notification settings - Fork 693
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.
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
Postfix fix for focal #5777
Postfix fix for focal #5777
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @kushaldas , it appears that while the changes proposed here work in staging environments, they will not work in production context (see inline).
Furthermore, could you please elaborate on the following directive in the PR description:
sudo apt install ubuntu-release-upgrader-core
Does this warrant a follow up issue?
@@ -62,3 +62,7 @@ maximal_queue_lifetime = 14d | |||
# Used to remap outbound from address in emails | |||
smtp_generic_maps = hash:/etc/postfix/generic | |||
{% endif %} | |||
{% if securedrop_target_distribution == "focal" %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In it's current form, this condition will never be met in production context on a Focal install. This is because securedrop_target_distribution
is mainly used for the package build logic, and defaults to xenial
in
securedrop_target_distribution: xenial |
securedrop_target_distribution: "focal" |
securedrop_target_distribution
is undefined. Using ansible_distribution_release
should work for all cases (staging and production) here.
3c53b7d
to
9f115b1
Compare
9f115b1
to
a578e55
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @kushaldas . As discussed in #5777 (review) , I believe the variable you are looking for is ansible_distribution_release
, and not ansible_distribution
, which may explain the legitimate test failures in https://app.circleci.com/pipelines/github/freedomofpress/securedrop/1828/workflows/9c782e72-1972-40e1-8517-521ed4b1a0c7/jobs/49990 .
I have taken the liberty of force pushing this branch and rebasing on latest develop. Approving based on the diff, but please take a look and merge once CI is passing.
Status
Ready for review
Description of Changes
Fixes #5775
Adds postfix configuration for
Focal
based on http://www.postfix.org/postconf.5.html#smtpd_recipient_restrictionsTesting
sudo apt install ubuntu-release-upgrader-core
because the latest Bento box does not have that../securedrop-admin install
to install SecureDrop onFocal
./var/log/syslog
file.Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint
) and tests (make test
) pass in the development containerIf you made changes to
securedrop-admin
:make -C admin test
) pass in the admin development containerIf you made changes to the system configuration:
If you added or removed a file deployed with the application:
If you made non-trivial code changes:
Choose one of the following:
If you added or updated a code dependency:
Choose one of the following: