Merge pull request #154 from robinelfrink/master

Fix fetching default ssh_config.
This commit is contained in:
alxwr 2019-03-19 10:11:55 +01:00 committed by GitHub
commit 5ee38922e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{%- import_yaml "openssh/defaults.yaml" as default_settings -%} {%- import_yaml "openssh/defaults.yaml" as default_settings -%}
{%- set ssh_config = salt['pillar.get']('ssh_config', default=default_settings.ssh_config, merge=True) -%} {%- set ssh_config = salt['pillar.get']('ssh_config', default=default_settings.default.ssh_config, merge=True) -%}
{#- present in ssh_config and known in actual file options -#} {#- present in ssh_config and known in actual file options -#}
{%- set processed_options = [] -%} {%- set processed_options = [] -%}
{%- set string_or_list_options = ['KexAlgorithms', 'Ciphers', 'MACs'] -%} {%- set string_or_list_options = ['KexAlgorithms', 'Ciphers', 'MACs'] -%}