0
0
mirror of https://github.com/saltstack-formulas/openssh-formula.git synced 2024-11-28 01:18:12 +01:00

Allow moduli to be pulled as file

Added Jinja logic to allow the option to pull the moduli from an online source.
This commit is contained in:
Pandu E Poluan 2016-08-01 23:59:11 +07:00 committed by GitHub
parent 8ea31fd661
commit e6603ae62a

View File

@ -1,8 +1,19 @@
{% from "openssh/map.jinja" import openssh with context %} {% from "openssh/map.jinja" import openssh with context %}
{% if salt['pillar.get']('openssh:moduli', False) %} {% set moduli = salt['pillar.get']('openssh:moduli', False) -%}
{% set moduli_source = salt['pillar.get']('openssh:moduli_source', False) -%}
{% if moduli or moduli_source -%}
ssh_moduli: ssh_moduli:
file.managed: file.managed:
- name: {{ openssh.ssh_moduli }} - name: {{ openssh.ssh_moduli }}
{% if moduli -%}
# Although we have the contents of the moduli in the variable 'moduli',
# inlining the variable here *will* cause problems. Using the '|' literal string indicator
# Necessitates using the '|indent' filter, and this is too complex.
# Rather, let salt read the pillar itself.
- contents_pillar: openssh:moduli - contents_pillar: openssh:moduli
{% elif moduli_source -%}
- source: {{ moduli_source }}
- source_hash: {{ moduli_source|trim }}.hash
{%- endif %}
{% endif %} {% endif %}