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

Fixes #15 removes our logging plugin for sd-log #479

Merged
merged 2 commits into from
Mar 3, 2020
Merged

Fixes #15 removes our logging plugin for sd-log #479

merged 2 commits into from
Mar 3, 2020

Conversation

kushaldas
Copy link
Contributor

@kushaldas kushaldas commented Mar 3, 2020

Status

Ready for review

Description of Changes

This PR removes the sdlog.conf for rsyslog via rc.local file
for the sd-log vm.

Fixes freedomofpress/securedrop-log#15

Testing

  • make all
  • sd-log vm should not have any error at /var/log/syslog file.
  • sd-log vm /rw/config/rc.local file has the following lines:
# Add sd-rsyslog.conf file for syslog
rm -f /etc/rsyslog.d/sdlog.conf
systemctl restart rsyslog

Checklist

If you have made code changes

  • Linter (make flake8) passes in the development environment (this box may
    be left unchecked, as flake8 also runs in CI)

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0 of a Qubes install

  • This PR adds/removes files, and includes required updates to the packaging
    logic in MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec

This PR removes the sdlog.conf for rsyslog via rc.local file
for the sd-log vm.

Fixes #15
@emkll emkll self-assigned this Mar 3, 2020
@emkll emkll self-requested a review March 3, 2020 14:09
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kushaldas for the fix, works well for me locally,

  • make all
  • make test
  • sd-log vm should not have any error at /var/log/syslog file.
  • sd-log vm /rw/config/rc.local file has the following lines:
  • logs are flowing

Prior to merge, I think we should update the comments in sd-log-disable-plugin.sls (see inline comments)

# vim: set syntax=yaml ts=2 sw=2 sts=2 et :

##
# Disable securedrop-log rsyslog plugin in sd-log vm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we also link to the issue in the comments here? It would be useful to note, for future maintainers, that this is the side effect of using the same package for both the client and server component of the log: we want to make sure that sd-log does not send logs.

- marker_start: "### BEGIN securedrop-workstation ###"
- marker_end: "### END securedrop-workstation ###"
- content: |
# Add sd-rsyslog.conf file for syslog
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we are removing here, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I will update the comments.

Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @kushaldas, looks good to me!

Noting that you are adding a new file but since it's prefixed by sd, it will be caught by make clean, and since it's in the dom0 folder it is included in MANIFEST.in [1] and dom0 rpm spec [2]

[1]

include dom0/*.sls

[2]
install -m 644 dom0/*.sls %{buildroot}/srv/salt/

@emkll emkll merged commit 01652d6 into master Mar 3, 2020
@emkll emkll deleted the fix-sd-log branch March 3, 2020 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

securedrop-log errors in syslog
2 participants