Merge from develop changes

README.md

@@ -38,7 +38,7 @@ sshd_ListenAddress:
 sshd_skip_defaults: true
 sshd:
   Compression: true
-  ListenAddres:
+  ListenAddress:
     - "0.0.0.0"
     - "::"
   GSSAPIAuthentication: no

templates/sshd_config.j2

@@ -69,11 +69,11 @@ Match {{ match["Condition"] }}
 {%   endif %}
 {% endmacro %}
 {{ body_option("Port",sshd_Port) -}}
+{{ body_option("AddressFamily",sshd_AddressFamily) -}}
 {{ body_option("ListenAddress",sshd_ListenAddress) -}}
 {{ body_option("Protocol",sshd_Protocol) -}}
 {{ body_option("HostKey",sshd_HostKey) -}}
 {{ body_option("AcceptEnv",sshd_AcceptEnv) -}}
-{{ body_option("AddressFamily",sshd_AddressFamily) -}}
 {{ body_option("AllowAgentForwarding",sshd_AllowAgentForwarding) -}}
 {{ body_option("AllowGroups",sshd_AllowGroups) -}}
 {{ body_option("AllowTcpForwarding",sshd_AllowTcpForwarding) -}}

vars/Archlinux.yml

@@ -0,0 +1,14 @@
+---
+sshd_service: sshd
+sshd_packages:
+  - openssh
+sshd_sftp_server: /usr/lib/ssh/sftp-server
+sshd_defaults:
+  Port: 22
+  Protocol: 2
+  AuthorizedKeysFile: .ssh/authorized_keys
+  ChallengeResponseAuthentication: no
+  PrintMotd: no
+  Subsystem: "sftp {{ sshd_sftp_server }}"
+  UsePAM: yes
+  UsePrivilegeSeparation: sandbox

vars/Debian.yml

@@ -13,7 +13,7 @@ sshd_defaults:
     - /etc/ssh/ssh_host_rsa_key
     - /etc/ssh/ssh_host_dsa_key
     - /etc/ssh/ssh_host_ecdsa_key
-  UsePrivilegeSeperation: yes
+  UsePrivilegeSeparation: yes
   KeyRegenerationInterval: 3600
   ServerKeyBits: 768
   SyslogFacility: AUTH

vars/RedHat_7.yml

@@ -15,7 +15,7 @@ sshd_defaults:
   GSSAPICleanupCredentials: yes
   UsePAM: yes
   X11Forwarding: yes
-  UsePrivilegeSeperation: sandbox
+  UsePrivilegeSeparation: sandbox
   AcceptEnv:
     - LANG LC_TYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
     - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT

vars/Ubuntu.yml

@@ -13,7 +13,7 @@ sshd_defaults:
     - /etc/ssh/ssh_host_dsa_key
     - /etc/ssh/ssh_host_ecdsa_key
     - /etc/ssh/ssh_host_ed25519_key
-  UsePrivilegeSeperation: yes
+  UsePrivilegeSeparation: yes
   KeyRegenerationInterval: 3600
   ServerKeyBits: 1024
   SyslogFacility: AUTH