diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-13 14:01:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 14:01:18 +0200 |
| commit | 19effc69296911e45e848f96100ff6595571a7df (patch) | |
| tree | c345d87b943bdc3f1af69bd2004f05032ab94d83 | |
| parent | 9c8dac06170eaddd312abb52b0b5724ada4c5ee8 (diff) | |
| parent | fbdf1e4d175079d726124a695b584e62e0530834 (diff) | |
| download | vyos-1x-19effc69296911e45e848f96100ff6595571a7df.tar.gz vyos-1x-19effc69296911e45e848f96100ff6595571a7df.zip | |
Merge pull request #339 from jjakob/openvpn-dir-fix
openvpn: T2283: move ccd to /run/openvpn
| -rw-r--r-- | data/templates/openvpn/server.conf.tmpl | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-openvpn.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl index 340ead269..c909f4337 100644 --- a/data/templates/openvpn/server.conf.tmpl +++ b/data/templates/openvpn/server.conf.tmpl @@ -85,7 +85,7 @@ max-clients {{ server_max_conn }} {%- endif %} {%- if client %} -client-config-dir /opt/vyatta/etc/openvpn/ccd/{{ intf }} +client-config-dir /run/openvpn/ccd/{{ intf }} {%- endif %} {%- if server_reject_unconfigured %} diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py index 85945ba58..66b96debe 100755 --- a/src/conf_mode/interfaces-openvpn.py +++ b/src/conf_mode/interfaces-openvpn.py @@ -666,10 +666,10 @@ def generate(openvpn): directories = [] directories.append(f'{directory}/status') directories.append(f'{directory}/ccd/{interface}') - for directory in directories: - if not os.path.exists(directory): - os.makedirs(directory, 0o755) - chown(directory, user, group) + for onedir in directories: + if not os.path.exists(onedir): + os.makedirs(onedir, 0o755) + chown(onedir, user, group) # Fix file permissons for keys fix_permissions = [] |