Skip to content

Commit

Permalink
Configure sd-log at the same time as other VMs
Browse files Browse the repository at this point in the history
Historically sd-log (and its template) was being configured earlier
than the remaining qubes so that logs would be captured early in the
install process. However, is some cases restarting sd-log hangs due
the already-configured templates trying to send logs to it, which
starts sd-log, while it is getting shut down (#1247).

The current solution to avoid this race-condition and adhering more
to the salt convention of not trying to force order outside of salt,
sd-log will no longer be setup early.

After a full system restart sd-log should be capturing logs as it
normally would.
  • Loading branch information
deeplow authored and rocodes committed Feb 20, 2025
1 parent 3d0d549 commit 68875a8
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions files/sdw-admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ def provision_and_configure():
provision("Provisioning base template", "securedrop_salt.sd-base-template")
configure("Configuring base template", ["sd-base-bookworm-template"])
provision_all()
configure(
"Configuring template for log sink before anything else",
["sd-small-bookworm-template"],
restart=["sd-log"],
)
configure("Enabling Whonix customizations", ["whonix-gateway-17"])
configure(
"Configure all SecureDrop Workstation VMs with service-specific configs",
Expand Down

0 comments on commit 68875a8

Please # to comment.