diff options
| -rw-r--r-- | pillar/macros.jinja | 6 | ||||
| -rw-r--r-- | pillar/map.jinja | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pillar/macros.jinja b/pillar/macros.jinja index 1d3eade..91d149c 100644 --- a/pillar/macros.jinja +++ b/pillar/macros.jinja @@ -24,3 +24,9 @@ interfaces: {{ interfaces }} {%- endif -%} {%- endmacro -%} + +{%- macro nginx_crtkeypair(name, ssldir) -%} +tls_{{ name }}: + - ssl_certificate: {{ sslbase }}/{{ ssldir }}/crt + - ssl_certificate_key: {{ sslbase }}/{{ ssldir }}/key +{%- endmacro -%} diff --git a/pillar/map.jinja b/pillar/map.jinja index bb0a536..849eb15 100644 --- a/pillar/map.jinja +++ b/pillar/map.jinja @@ -1,6 +1,9 @@ +{%- set sslbase = '/etc/ssl' -%} +{%- from 'macros.jinja' import nginx_crtkeypair with context -%} {%- from 'macros.jinja' import firewall_interfaces, listeners -%} {%- set firewall_interfaces = firewall_interfaces -%} {%- set listeners = listeners -%} +{%- set nginx_crtkeypair = nginx_crtkeypair -%} {%- set minion = grains['id'] -%} {#- START Listener detection logic -#} |