Infers hostname for "localvm" setting #16
Conversation
Still checks the config first, but if the "localvm" flag isn't set there, defaults to the hostname provided by the system. Useful for simplfying config story between TemplateVMs & AppVMs in Qubes.
There was a problem hiding this comment.
Reviewing as part of freedomofpress/securedrop-workstation#476, looks good to me, package builds and works properly. Running into issues with some of the changes introduced here, however whonix-based VMs, which return host as hostname (more detail will be provided in the securedrop-worksation pr). Another comment/question inline
| @@ -81,7 +82,7 @@ def onInit(): | |||
| config = configparser.ConfigParser() | |||
| config.read('/etc/sd-rsyslog.conf') | |||
| logvmname = config['sd-rsyslog']['remotevm'] | |||
There was a problem hiding this comment.
sd-rsyslog-example.conf included in this package provides an example configuration, but sd-syslog.conf is not provisioned via the packaging logic. would it make sense to provide a default sd-syslog.conf that will work in most conditions, containing just remotevm=sd-log and overwrite/append with salt
There was a problem hiding this comment.
Shipping a default file to /etc/ does indeed make sense to me @emkll, although we'll have to be mindful of conffiles behavior over time. If we plan to customize that file over time, we'll have to do so in postinst or via salt.
There was a problem hiding this comment.
Let's defer the conffiles update until post-pilot, given the QA load involved with sufficient testing.
There was a problem hiding this comment.
changes reviewed in freedomofpress/securedrop-workstation#487 (review) , visual diff LGTM
Still checks the config first, but if the "localvm" flag isn't set
there, defaults to the hostname provided by the system. Useful for
simplfying config story between TemplateVMs & AppVMs in Qubes.
Refs: freedomofpress/securedrop-workstation#476
Testing
See full test plan in the SDW repo, and follow the steps there. Order of operations: