mirror of
https://github.com/saltstack-formulas/openssh-formula.git
synced 2026-09-21 23:27:50 +02:00
feat(map): config.get lookups from configurable roots
We avoid compatibility break with user pillars by looking up configuration values using `config.get` in configurable roots. We provide a new parameter `map_jinja:config_get_roots` in the formula `parameters/defaults.yaml`to retrives values not only from `tplroot=openssh` but from `sshd_config` and `ssh_config` too. We need to update the `_mapdata` reference files to include the new `map_jinja:config_get_roots`.
This commit is contained in:
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Amazon Linux AMI-2018
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Amazon Linux-2
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Arch
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# CentOS-6
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# CentOS Linux-7
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# CentOS Linux-8
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Debian-10
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Debian-9
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Fedora-31
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Fedora-32
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Leap-15
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Ubuntu-16.04
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Ubuntu-18.04
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
# yamllint disable rule:indentation rule:line-length
|
||||
# Ubuntu-20.04
|
||||
---
|
||||
map_jinja:
|
||||
config_get_roots:
|
||||
- openssh
|
||||
- sshd_config
|
||||
- ssh_config
|
||||
openssh:
|
||||
absent_dsa_keys: false
|
||||
absent_ecdsa_keys: false
|
||||
|
||||
Reference in New Issue
Block a user