From 28e0916840084ee51d314f0cc0e19f257bf249c3 Mon Sep 17 00:00:00 2001
From: Marc Schiffbauer <marc@schiffbauer.net>
Date: Mon, 23 Mar 2015 14:55:40 +0100
Subject: [PATCH 1/2] sort distros alphabetically

---
 openssh/map.jinja | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/openssh/map.jinja b/openssh/map.jinja
index 566b265..0ebd307 100644
--- a/openssh/map.jinja
+++ b/openssh/map.jinja
@@ -1,4 +1,13 @@
 {% set openssh = 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',
+    },
     'Debian': {
         'server': 'openssh-server',
         'client': 'openssh-client',
@@ -8,6 +17,13 @@
         'banner': '/etc/ssh/banner',
         'banner_src': 'salt://openssh/files/banner',
     },
+    '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',
+    },
     'RedHat': {
         'server': 'openssh-server',
         'client': 'openssh',
@@ -26,20 +42,4 @@
         'banner': '/etc/ssh/banner',
         'banner_src': 'salt://openssh/files/banner',
     }, 
-    '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',
-    },
-    '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',
-    }, 
 }, merge=salt['pillar.get']('openssh:lookup')) %}

From c6aeaf4dc5a651b2590d52f8f5ce463c4958bb68 Mon Sep 17 00:00:00 2001
From: Marc Schiffbauer <marc@schiffbauer.net>
Date: Mon, 23 Mar 2015 14:56:12 +0100
Subject: [PATCH 2/2] add gentoo support

---
 openssh/map.jinja | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openssh/map.jinja b/openssh/map.jinja
index 0ebd307..883c96d 100644
--- a/openssh/map.jinja
+++ b/openssh/map.jinja
@@ -24,6 +24,15 @@
         'banner': '/etc/ssh/banner',
         'banner_src': 'salt://openssh/files/banner',
     },
+    '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',
+    },
     'RedHat': {
         'server': 'openssh-server',
         'client': 'openssh',