From ca62b7d11848169f06749d89c217b3ede64e51bb Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Tue, 2 Jun 2015 22:52:59 +0200
Subject: [PATCH] Improve default lookup

Added defaults.yaml and map.jinja similar to template-formula and salt-formula
---
 openssh/defaults.yaml |   7 +++
 openssh/map.jinja     | 100 +++++++++++++++++++-----------------------
 2 files changed, 52 insertions(+), 55 deletions(-)
 create mode 100644 openssh/defaults.yaml

diff --git a/openssh/defaults.yaml b/openssh/defaults.yaml
new file mode 100644
index 0000000..07fad2f
--- /dev/null
+++ b/openssh/defaults.yaml
@@ -0,0 +1,7 @@
+openssh:
+  sshd_config: /etc/ssh/sshd_config
+  sshd_config_src: salt://openssh/files/sshd_config
+  banner: /etc/ssh/banner
+  banner_src: salt://openssh/files/banner
+  ssh_known_hosts: /etc/ssh/ssh_known_hosts
+  dig_pkg: dnsutils
diff --git a/openssh/map.jinja b/openssh/map.jinja
index 17e9f8d..95d2367 100644
--- a/openssh/map.jinja
+++ b/openssh/map.jinja
@@ -1,66 +1,56 @@
-{% set openssh = salt['grains.filter_by']({
+{## Start with  defaults from defaults.yaml ##}
+{% import_yaml "openssh/defaults.yaml" as default_settings %}
+
+{## 
+Setup variable using grains['os_family'] based logic, only add key:values here
+that differ from whats in defaults.yaml
+##}
+{% set os_family_map = salt['grains.filter_by']({
     'Arch': {
-        'server': 'openssh',
-        'client': 'openssh',
-        'service': 'sshd.socket',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'dnsutils',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
+      'server': 'openssh',
+      'client': 'openssh',
+      'service': 'sshd.socket',
     },
     'Debian': {
-        'server': 'openssh-server',
-        'client': 'openssh-client',
-        'service': 'ssh',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'dnsutils',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
+      'server': 'openssh-server',
+      'client': 'openssh-client',
+      'service': 'ssh',
     },
     'FreeBSD': {
-        'service': 'sshd',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'bind-tools',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
+      'service': 'sshd',
+      'dig_pkg': 'bind-tools',
     },
     'Gentoo': {
-        'server': 'net-misc/openssh',
-        'client': 'net-misc/openssh',
-        'service': 'sshd',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'net-dns/bind-tools',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
+      'server': 'net-misc/openssh',
+      'client': 'net-misc/openssh',
+      'service': 'sshd',
+      'dig_pkg': 'net-dns/bind-tools',
     },
     'RedHat': {
-        'server': 'openssh-server',
-        'client': 'openssh',
-        'service': 'sshd',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'bind-utils',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
+      'server': 'openssh-server',
+      'client': 'openssh',
+      'service': 'sshd',
+      'dig_pkg': 'bind-utils',
     },
     'Suse': {
-        'server': 'openssh',
-        'client': 'openssh',
-        'service': 'sshd',
-        'sshd_config': '/etc/ssh/sshd_config',
-        'sshd_config_src': 'salt://openssh/files/sshd_config',
-        'banner': '/etc/ssh/banner',
-        'banner_src': 'salt://openssh/files/banner',
-        'dig_pkg': 'bind-utils',
-        'ssh_known_hosts': '/etc/ssh/ssh_known_hosts',
-    }, 
-}, merge=salt['pillar.get']('openssh:lookup')) %}
+      'server': 'openssh',
+      'client': 'openssh',
+      'service': 'sshd',
+      'dig_pkg': 'bind-utils',
+    },
+  }
+  , grain="os_family"
+  , merge=salt['pillar.get']('openssh:lookup'))
+%}
+
+{## Merge the flavor_map to the default settings ##}
+{% do default_settings.openssh.update(os_family_map) %}
+
+{## Merge in openssh:lookup pillar ##}
+{% set openssh = salt['pillar.get'](
+    'openssh',
+    default=default_settings.openssh,
+    merge=True
+  )
+%}
+