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.

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

Leverage systemd conditionals for logging services #396

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion securedrop-log/debian/securedrop-log.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ securedrop.Log etc/qubes-rpc/
sd-rsyslog usr/sbin/
securedrop-log.service etc/systemd/system
sdlog.conf etc/rsyslog.d/

2 changes: 1 addition & 1 deletion securedrop-workstation-config/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: securedrop-workstation-config
Section: unknown
Priority: optional
Maintainer: SecureDrop Team <[email protected]>
Build-Depends: debhelper-compat (= 11),
Build-Depends: debhelper-compat (= 11)
Standards-Version: 3.9.8
Homepage: https://github.com/freedomofpress/securedrop-workstation-config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ mimeapps.list.sd-app opt/sdw/
mimeapps.list.sd-devices-dvm opt/sdw/
open-in-dvm.desktop opt/sdw/
paxctld.conf opt/sdw/
securedrop-disable-remote-logging.service etc/systemd/system
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=SecureDrop: Disable remote logging for sd-log and sd-gpg
Before=rsyslog.service
ConditionHost=|sd-log
ConditionHost=|sd-gpg

[Service]
Type=oneshot
ExecStart=/usr/bin/rm /etc/rsyslog.d/sdlog.conf

[Install]
WantedBy=multi-user.target