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 vmname via rc.local #482

Closed
wants to merge 1 commit into from
Closed

Fixes vmname via rc.local #482

wants to merge 1 commit into from

Conversation

kushaldas
Copy link
Contributor

Status

Work in progress

Description of Changes

All VMs and templates has separate vmname for securedrop-log
via rsyslog.

Fixes #476 (partially) till now.

Testing

  • make all
  • Check sd-log vm for separate logs for the app vms and template vms.
  • make test shows no errors

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

All VMs and templates has separate vmname for securedrop-log
via rsyslog.
@kushaldas
Copy link
Contributor Author

While doing a make all for this PR/branch, I am getting an error with Tor in sd-whonix.

DisableNetwork 1 it can not restart saying that line is mentioned at the end somewhere. Can anyone please have a look?

@conorsch conorsch self-requested a review March 3, 2020 22:31
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Rather than add salt logic to customize the VM name, let's instead just trust the hostname returned by the VM (regardless of whether AppVM or TemplateVM), and use that. Doing so will require a small update to the logging package, but remove the need to treat each VM differently. See related discussion in #476 (comment)

@conorsch
Copy link
Contributor

conorsch commented Mar 4, 2020

Took a stab at simplifying the securedrop-log config logic, there's a WIP in a separate branch: https://github.com/freedomofpress/securedrop-workstation/compare/476-simplify-logging-hostname-config Not opening a PR because I haven't tested it fully yet, will revisit soon.

@conorsch
Copy link
Contributor

conorsch commented Mar 5, 2020

See #487 for an alternative implementation. If merged, #487 would supersede (and therefore close) this PR.

@kushaldas
Copy link
Contributor Author

Closing as we chose #487 over this one.

@kushaldas kushaldas closed this Mar 16, 2020
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.

Template logs are their corresponding AppVMs
2 participants