-
Notifications
You must be signed in to change notification settings - Fork 46
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
Configure environment-specific services in dom0 via systemd #1038
Conversation
40a4af5
to
9ec2b0c
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.
I like where this is going :)
f8c2804
to
300f139
Compare
1d156d3
to
959600f
Compare
50cc076
to
d37d487
Compare
… systemd service to conditionally disable this service in dev environments. Write environment flag to /var/lib/securedrop-workstation/ during Saltstack orchestration.
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.
Looks good, minor notes inline. Will test it now
It seems if I switch to a dev install and then back to staging/prod, rpm will not restore the deleted Maybe this is an OK limitation for now? that if you switch to dev you need to do a full provision from scratch to switch to staging/prod. |
Ugh, good catch, and I don't love that. I always Another solution could be putting a second, lower-priority configuration file that unsets this option on dev systems, instead of a service that deletes the other override file. (With the eventual goal of moving more logic out of salt and into the rpm so that we can cleanly uninstall and reinstall each time we re-provision, and so that there is symmetry in terms of where the setup/teardown actions happen, instead of them being in two places). Either way I'm not forcing this through if we're unhappy with it in some way - I'll make your suggested changes (thank you!) and let me know your thoughts re the way to handle the dev configuration. |
I think this is a reasonable limitation for now, I'm okay with documenting it in a bug as something to eventually fix. (Finishing up the test plan now) |
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.
LGTM \o/
Status
Ready for review
Description of Changes
Refs #1004 (comment)
Supersedes #1031
Changes proposed in this pull request:
sdw-admin --apply
, the power settings are in effect. But I think devs can handle that; usually those things follow pretty closely one after the other.]dev
,staging
,prod
) to /var/lib/securedrop-workstation/ during Saltstack orchestration.Testing
sdw-admin --uninstall
(or skip if fresh install scenario)systemctl --user list-unit-files | grep enabled
showsuser-xfce-settings.service
anduser-xfce-icon-size.service
systemctl list-unit-files | grep logind
showslogind-override-disable.service
as enabledsystemctl daemon-reexec
), power setting changes are revertedDeployment
Any special considerations for deployment? Consider both:
Checklist
If you have made changes to the provisioning logic
make test
) pass indom0
If you have added or removed files
MANIFEST.in
andrpm-build/SPECS/securedrop-workstation-dom0-config.spec
If documentation is required