fix(macros): use openvpn/macros.jinja

alxwr · alxwr · commit 637387ec5d15 · 2019-07-13T19:16:15.000+02:00
diff --git a/openvpn/config.sls b/openvpn/config.sls
@@ -1,5 +1,5 @@
 {% from "openvpn/map.jinja" import map with context %}
-{% from "openvpn/map.jinja" import multipart_param with context %}
+{% from "openvpn/macros.jinja" import multipart_param with context %}
 
 include:
   - openvpn
diff --git a/openvpn/files/common_opts.jinja b/openvpn/files/common_opts.jinja
@@ -1,4 +1,4 @@
-{% from "openvpn/map.jinja" import multipart_param with context %}
+{% from "openvpn/macros.jinja" import multipart_param with context %}
 
 {%- if config.daemon is defined and config.daemon == True %}
 daemon
diff --git a/openvpn/macros.jinja b/openvpn/macros.jinja
@@ -0,0 +1,13 @@
+{%- macro multipart_param(value, index=None) %}
+{%-   if value is string %}
+{%-     set value = value.split() %}
+{%-   endif %}
+{%-   if not index is none -%}
+{{ value[index] }}
+{%-   else -%}
+{%-     for item in value -%}
+{%-       if not loop.first %} {% endif -%}
+{{        item }}
+{%-     endfor %}
+{%-   endif %}
+{%- endmacro -%}
diff --git a/openvpn/map.jinja b/openvpn/map.jinja
@@ -22,17 +22,3 @@
     ),
     base='openvpn')
  %}
-
-{%- macro multipart_param(value, index=None) %}
-{%-   if value is string %}
-{%-     set value = value.split() %}
-{%-   endif %}
-{%-   if not index is none -%}
-{{ value[index] }}
-{%-   else -%}
-{%-     for item in value -%}
-{%-       if not loop.first %} {% endif -%}
-{{        item }}
-{%-     endfor %}
-{%-   endif %}
-{%- endmacro -%}
diff --git a/openvpn/network_manager_networks/files/connection.jinja b/openvpn/network_manager_networks/files/connection.jinja
@@ -1,4 +1,4 @@
-{%- from "openvpn/map.jinja" import multipart_param with context -%}
+{%- from "openvpn/macros.jinja" import multipart_param with context -%}
 {%- set config = salt['pillar.get']('openvpn:network_manager:networks:'+network_name, {}) -%}
 {%- macro pairs(data) -%}
 {%-   for key, value in data|dictsort -%}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% from "openvpn/map.jinja" import multipart_param with context %}`
	`1`	`+{% from "openvpn/macros.jinja" import multipart_param with context %}`
`2`	`2`
`3`	`3`	`{%- if config.daemon is defined and config.daemon == True %}`
`4`	`4`	`daemon`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{%- from "openvpn/map.jinja" import multipart_param with context -%}`
	`1`	`+{%- from "openvpn/macros.jinja" import multipart_param with context -%}`
`2`	`2`	`{%- set config = salt['pillar.get']('openvpn:network_manager:networks:'+network_name, {}) -%}`
`3`	`3`	`{%- macro pairs(data) -%}`
`4`	`4`	`{%- for key, value in data\|dictsort -%}`