summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-02-23 19:52:59 +0100
committerChristian Poessinger <christian@poessinger.com>2020-02-23 19:52:59 +0100
commitcd2147cfa2dc3202fa044b17592a6ddb28275daa (patch)
tree4734b60f51cc71df8240e74c2f4eca69d67025eb
parent54b9b8f80ce1a16362c4ef6e89efc70ef29ae59e (diff)
downloadvyos-1x-cd2147cfa2dc3202fa044b17592a6ddb28275daa.tar.gz
vyos-1x-cd2147cfa2dc3202fa044b17592a6ddb28275daa.zip
openvpn: T2065: move daemon parameter to start-stop-daemon command-line
-rwxr-xr-xsrc/conf_mode/interfaces-openvpn.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index 3a7bc6611..6bd269e97 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -51,7 +51,6 @@ config_tmpl = """
verb 3
status /opt/vyatta/etc/openvpn/status/{{ intf }}.status 30
writepid /var/run/openvpn/{{ intf }}.pid
-daemon openvpn-{{ intf }}
dev-type {{ type }}
dev {{ intf }}
@@ -224,7 +223,7 @@ cipher aes-256-cbc
{%- if ncp_ciphers %}
ncp-ciphers {{ncp_ciphers}}
-{% endif %}
+{% endif %}
{%- if disable_ncp %}
ncp-disable
{% endif %}
@@ -968,6 +967,7 @@ def apply(openvpn):
cmd += ' --exec /usr/sbin/openvpn'
# now pass arguments to openvpn binary
cmd += ' --'
+ cmd += ' --daemon openvpn-' + openvpn['intf']
cmd += ' --config ' + get_config_name(openvpn['intf'])
# execute assembled command