Adopt osfinger subdirectory names for screen and ssh.

Add ssh client configuration.

base/screen/init.sls

@@ -7,6 +7,6 @@ screen:
 screenrc:
   file.managed:
     - name: {{ screen.screenrc_file }}
-    - source: salt://screen/files/{{ screen.screenrc_file_source }}
+    - source: salt://screen/files/{{ grains['osfinger'] }}/screenrc
     - require:
       - pkg: screen

base/screen/map.jinja

@@ -2,11 +2,9 @@
 	'Debian': {
 		'package': 'screen',
 		'screenrc_file': '/etc/screenrc',
-		'screenrc_file_source': 'debian/%s/screenrc' % salt['grains.get']('osmajorrelease')
 	},
 	'Ubuntu': {
 		'package': 'screen',
 		'screenrc_file': '/etc/screenrc',
-		'screenrc_file_source': 'ubuntu/%s/screenrc' % salt['grains.get']('osrelease')
 	}
 }, grain='os', merge=salt['pillar.get']('screen:lookup')) %}

base/ssh/files/Ubuntu-17.04/ssh_config

@@ -0,0 +1,56 @@
+
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
+
+# Configuration data is parsed as follows:
+#  1. command line options
+#  2. user-specific file
+#  3. system-wide file
+# Any configuration value is only changed the first time it is set.
+# Thus, host-specific definitions should be at the beginning of the
+# configuration file, and defaults at the end.
+
+# Site-wide defaults for some commonly used options.  For a comprehensive
+# list of available options, their meanings and defaults, please see the
+# ssh_config(5) man page.
+
+Host *
+#   ForwardAgent no
+#   ForwardX11 no
+#   ForwardX11Trusted yes
+#   RhostsRSAAuthentication no
+#   RSAAuthentication yes
+#   PasswordAuthentication yes
+#   HostbasedAuthentication no
+#   GSSAPIAuthentication no
+#   GSSAPIDelegateCredentials no
+#   GSSAPIKeyExchange no
+#   GSSAPITrustDNS no
+#   BatchMode no
+#   CheckHostIP yes
+#   AddressFamily any
+#   ConnectTimeout 0
+#   StrictHostKeyChecking ask
+#   IdentityFile ~/.ssh/identity
+#   IdentityFile ~/.ssh/id_rsa
+#   IdentityFile ~/.ssh/id_dsa
+#   IdentityFile ~/.ssh/id_ecdsa
+#   IdentityFile ~/.ssh/id_ed25519
+#   Port 22
+#   Protocol 2
+#   Cipher 3des
+#   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
+#   EscapeChar ~
+#   Tunnel no
+#   TunnelDevice any:any
+#   PermitLocalCommand no
+#   VisualHostKey no
+#   ProxyCommand ssh -q -W %h:%p gateway.example.com
+#   RekeyLimit 1G 1h
+    SendEnv LANG LC_*
+    HashKnownHosts yes
+    GSSAPIAuthentication yes
+    PubkeyAcceptedKeyTypes=+ssh-dss

base/ssh/init.sls

@@ -0,0 +1,12 @@
+{% from 'ssh/map.jinja' import ssh %}
+
+ssh:
+  pkg.installed:
+    - name: {{ ssh.client_package }}
+
+ssh_config:
+  file.managed:
+    - name: {{ ssh.client_config_file }}
+    - source: salt://ssh/files/{{ grains['osfinger'] }}/ssh_config
+    - require:
+      - pkg: ssh

base/ssh/map.jinja

@@ -1,14 +1,16 @@
 {% set ssh = salt['grains.filter_by']({
 	'Debian': {
+		'client_package': 'openssh-client',
+		'client_config_file': '/etc/ssh/ssh_config',
 		'server_package': 'openssh-server',
 		'server_service': 'ssh',
 		'server_config_file': '/etc/ssh/sshd_config',
-		'server_config_file_source': 'debian/%s/sshd_config' % salt['grains.get']('osmajorrelease')
 	},
 	'Ubuntu': {
+		'client_package': 'openssh-client',
 		'server_package': 'openssh-server',
 		'server_service': 'ssh',
 		'server_config_file': '/etc/ssh/sshd_config',
-		'server_config_file_source': 'ubuntu/%s/sshd_config' % salt['grains.get']('osrelease')
+		'client_config_file': '/etc/ssh/ssh_config',
 	},
 }, grain='os', merge=salt['pillar.get']('ssh:lookup')) %}

base/ssh/server/init.sls

@@ -1,5 +1,8 @@
 {% from 'ssh/map.jinja' import ssh %}
 
+include:
+  - ssh
+
 sshd:
   pkg.installed:
     - name: {{ ssh.server_package }}
@@ -12,6 +15,6 @@ sshd:
 sshd_config:
   file.managed:
     - name: {{ ssh.server_config_file }}
-    - source: salt://ssh/server/files/{{ ssh.server_config_file_source }}
+    - source: salt://ssh/server/files/{{ grains['osfinger'] }}/sshd_config
     - require:
       - pkg: sshd