Merge pull request #16 from freedomofpress/infer-hostname

Infers hostname for "localvm" setting
freedomofpress · Mar 11, 2020 · 6e0dc3f · 6e0dc3f
2 parents 7976e0f + 89668e2
commit 6e0dc3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+0.1.1
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.1
+
+  * Infers hostname from system settings, if no config value found.
+
 ## 0.1.0
 
   * Initial beta release.

diff --git a/sd-rsyslog b/sd-rsyslog
@@ -30,6 +30,7 @@ import os
 import logging
 import configparser
 from subprocess import Popen, PIPE
+from socket import gethostname
 
 # Global definitions specific to your plugin
 process = None
@@ -81,7 +82,7 @@ def onInit():
     config = configparser.ConfigParser()
     config.read('/etc/sd-rsyslog.conf')
     logvmname = config['sd-rsyslog']['remotevm']
-    localvmname = config['sd-rsyslog']['localvm']
+    localvmname = config['sd-rsyslog'].get('localvm', gethostname())
     process = Popen(
             ["/usr/lib/qubes/qrexec-client-vm", logvmname, "securedrop.Log"],
             stdin=PIPE,