summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-06-18 21:44:17 +0200
committerChristian Poessinger <christian@poessinger.com>2020-06-18 21:46:26 +0200
commit067ddcf27ac1fbc33cee710ae66a85b0368a26d9 (patch)
tree406c0b32b8ba5524c154869355d3577e9db9047f /src
parentb242e24af4d870e936155bdbd965858bdd39aa98 (diff)
downloadvyos-1x-067ddcf27ac1fbc33cee710ae66a85b0368a26d9.tar.gz
vyos-1x-067ddcf27ac1fbc33cee710ae66a85b0368a26d9.zip
console-server: T2490: log to journald
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/service_serial-proxy.py2
-rw-r--r--src/etc/systemd/system/conserver-server.service.d/override.conf6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/conf_mode/service_serial-proxy.py b/src/conf_mode/service_serial-proxy.py
index 85fcfed08..0dd1cfc6d 100755
--- a/src/conf_mode/service_serial-proxy.py
+++ b/src/conf_mode/service_serial-proxy.py
@@ -24,7 +24,7 @@ from vyos.template import render
from vyos.util import call
from vyos import ConfigError
-config_file = r'/etc/conserver/conserver.cf'
+config_file = r'/run/conserver/conserver.cf'
# Default values are necessary until the implementation of T2588 is completed
default_values = {
diff --git a/src/etc/systemd/system/conserver-server.service.d/override.conf b/src/etc/systemd/system/conserver-server.service.d/override.conf
index 1be5cec81..5301b38ce 100644
--- a/src/etc/systemd/system/conserver-server.service.d/override.conf
+++ b/src/etc/systemd/system/conserver-server.service.d/override.conf
@@ -1,3 +1,9 @@
[Unit]
After=
After=vyos-router.service
+
+[Service]
+Type=simple
+ExecStart=
+ExecStart=/usr/sbin/conserver -C /run/conserver/conserver.cf
+