From 2acebb77b2a7d48bdce887d98e87eaa758ea8fac Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Sat, 17 Dec 2022 23:34:54 +0100 Subject: [PATCH] updated openvpn_client state --- states/openvpn_client/config.sls | 4 ++-- states/openvpn_client/{ => templates}/pass.j2 | 2 +- states/openvpn_client/{ => templates}/vpn.conf.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename states/openvpn_client/{ => templates}/pass.j2 (94%) rename states/openvpn_client/{ => templates}/vpn.conf.j2 (96%) diff --git a/states/openvpn_client/config.sls b/states/openvpn_client/config.sls index fa8e593..fd8e80e 100644 --- a/states/openvpn_client/config.sls +++ b/states/openvpn_client/config.sls @@ -3,7 +3,7 @@ openvpn-client-main-config: file.managed: - name: {{ openvpn_client.config_dir }}/vpn.conf - - source: salt://openvpn_client/vpn.conf.j2 + - source: salt://openvpn_client/templates/vpn.conf.j2 - user: root - group: root - mode: 0600 @@ -23,7 +23,7 @@ openvpn-client-private-dir: openvpn-client-private-access: file.managed: - name: {{ openvpn_client.config_dir }}/private/pass - - source: salt://openvpn_client/pass.j2 + - source: salt://openvpn_client/templates/pass.j2 - template: jinja - user: root - group: root diff --git a/states/openvpn_client/pass.j2 b/states/openvpn_client/templates/pass.j2 similarity index 94% rename from states/openvpn_client/pass.j2 rename to states/openvpn_client/templates/pass.j2 index 527c662..adff34d 100644 --- a/states/openvpn_client/pass.j2 +++ b/states/openvpn_client/templates/pass.j2 @@ -4,4 +4,4 @@ {{ client.name }} {{ client.password }} {%- endif -%} -{%- endfor -%} \ No newline at end of file +{%- endfor -%} diff --git a/states/openvpn_client/vpn.conf.j2 b/states/openvpn_client/templates/vpn.conf.j2 similarity index 96% rename from states/openvpn_client/vpn.conf.j2 rename to states/openvpn_client/templates/vpn.conf.j2 index 859f912..efc2999 100644 --- a/states/openvpn_client/vpn.conf.j2 +++ b/states/openvpn_client/templates/vpn.conf.j2 @@ -34,4 +34,4 @@ pull-filter ignore "route {{ net.split("/")[0] }}" {%- endif %} {%- endfor %} -auth-user-pass private/pass \ No newline at end of file +auth-user-pass private/pass