df477b25c2
The `map.jinja` now exports a single variable called `mapdata`. We extract the `openssh`, `sshd_config` and `ssh_config` from it to minimize the changes to `.sls` files.
33 lines
967 B
Plaintext
33 lines
967 B
Plaintext
{%- from "openssh/map.jinja" import mapdata with context %}
|
|
{%- set openssh = mapdata.openssh %}
|
|
{%- set sshd_config = mapdata.sshd_config %}
|
|
|
|
include:
|
|
- openssh
|
|
|
|
{%- if sshd_config %}
|
|
sshd_config-with-ini:
|
|
{#- Convert any tabs to a single space to prevent false positives #}
|
|
{#- Ref: https://github.com/saltstack-formulas/openssh-formula/issues/162 #}
|
|
{%- set regex_search_for_tabs = '^(\w+)\t+(\w)' %}
|
|
{%- if salt['file.contains_regex'](openssh.sshd_config, regex_search_for_tabs) %}
|
|
file.replace:
|
|
- name: {{ openssh.sshd_config }}
|
|
- pattern: {{ regex_search_for_tabs }}
|
|
- repl: '\1 \2'
|
|
- show_changes: True
|
|
- require_in:
|
|
- ini: sshd_config-with-ini
|
|
{%- endif %}
|
|
|
|
ini.options_present:
|
|
- name: {{ openssh.sshd_config }}
|
|
- separator: ' '
|
|
- watch_in:
|
|
- service: {{ openssh.service }}
|
|
- sections:
|
|
{%- for k,v in sshd_config.items() %}
|
|
{{ k }}: '{{ v }}'
|
|
{%- endfor %}
|
|
{%- endif %}
|