diff options
| author | zsdc <taras@vyos.io> | 2021-10-04 10:40:31 +0300 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2021-10-04 10:40:31 +0300 |
| commit | 3fd2ff423b6c6e992b2ed531c7ba99fb9e1a2123 (patch) | |
| tree | f9e45d80111b80732b977cecd99289ac4fdc9c2e /src/etc/systemd/system/openvpn@.service.d/override.conf | |
| parent | 044e9dc8bc7e3d946b0ba1f1edfe06b5323aeadd (diff) | |
| download | vyos-1x-3fd2ff423b6c6e992b2ed531c7ba99fb9e1a2123.tar.gz vyos-1x-3fd2ff423b6c6e992b2ed531c7ba99fb9e1a2123.zip | |
OpenVPN: T3350: Changed custom options for OpenVPN processing
Custom OpenVPN options moved back to the command line from a
configuration file. This should keep full compatibility with the
`crux` branch, and allows to avoid mistakes with parsing options
that contain `--` in the middle.
The only smart part of this - handling a `push` option. Because
of internal changes in OpenVPN, previously it did not require an
argument in the double-quotes, but after version update in
`equuleus` and `sagitta` old syntax became invalid. So, all the
`push` options are processed to add quotes. The solution is still
not complete, because if a single config line contains `push` with
other options, it will not work, but it is better than nothing.
Diffstat (limited to 'src/etc/systemd/system/openvpn@.service.d/override.conf')
| -rw-r--r-- | src/etc/systemd/system/openvpn@.service.d/override.conf | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/etc/systemd/system/openvpn@.service.d/override.conf b/src/etc/systemd/system/openvpn@.service.d/override.conf deleted file mode 100644 index 03fe6b587..000000000 --- a/src/etc/systemd/system/openvpn@.service.d/override.conf +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -After= -After=vyos-router.service - -[Service] -WorkingDirectory= -WorkingDirectory=/run/openvpn -ExecStart= -ExecStart=/usr/sbin/openvpn --daemon openvpn-%i --config %i.conf --status %i.status 30 --writepid %i.pid -User=openvpn -Group=openvpn -AmbientCapabilities=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_AUDIT_WRITE -CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_AUDIT_WRITE |