fix(config): sub-mappings for client and server

Author: alxwr

openvpn/config.sls

@@ -24,7 +24,7 @@ include:
 {%-   set config_dir = config.conf_dir %}
 {%- else %}
 {#-   Some distributions use /etc/openvpn/{client,server} as their working directory #}
-{%-   set config_dir = map.get(type ~ "_conf_dir", map.conf_dir) %}
+{%-   set config_dir = map.get(type, {}).get("conf_dir", map.conf_dir) %}
 {%- endif %}
 
 {% set config_file = "{0}/openvpn_{1}.conf".format(config_dir, name) if map.multi_services and grains['os_family'] == 'FreeBSD' else "{0}/{1}.{2}".format(config_dir, name, map.conf_ext) %}

openvpn/dhparams.sls

@@ -3,7 +3,7 @@
 # Generate diffie hellman files
 {% if salt['pillar.get']('openvpn:server', False) %}
   {#- Some distributions use /etc/openvpn/{client,server} as their working directory #}
-  {%- set config_dir = map.get("server_conf_dir", map.conf_dir) %}
+  {%- set config_dir = map.get("server", {}).get("conf_dir", map.conf_dir) %}
   {%- for dh in map.dh_files %}
     {%- set dh_file = config_dir ~ "/dh" ~ dh ~ ".pem" %}
 openvpn_create_dh_{{ dh }}:

openvpn/osfamilymap.yaml

@@ -8,10 +8,12 @@ Arch:
 Debian:
   group: nogroup
   log_user: root
-  client_conf_dir: /etc/openvpn/client
-  client_service: openvpn-client
-  server_conf_dir: /etc/openvpn/server
-  server_service: openvpn-server
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
 RedHat:
   pkgs:
     - openvpn

openvpn/osmap.yaml

@@ -7,10 +7,12 @@ Debian:
     - jessie
     - stretch
 Fedora:
-  client_conf_dir: /etc/openvpn/client
-  client_service: openvpn-client
-  server_conf_dir: /etc/openvpn/server
-  server_service: openvpn-server
+  client:
+    conf_dir: /etc/openvpn/client
+    service: openvpn-client
+  server:
+    conf_dir: /etc/openvpn/server
+    service: openvpn-server
 Ubuntu:
   external_repo_supported:
     - precise

openvpn/service.sls

@@ -16,7 +16,7 @@
    Some distributions use /etc/openvpn/{client,server} as their working directory
    and openvpn-{client,server} as their service.
 #}
-{% set service_name = map.get(type ~ "_service", map.service) ~ '@' ~ name %}
+{% set service_name = map.get(type, {}).get("service", map.service) ~ '@' ~ name %}
 {% else %}
 {% set service_name = map.service ~ '_' ~ name %}
 {% endif %}