From 6da7bb1f557f51f02ca239bef21729666fb22a8f Mon Sep 17 00:00:00 2001 From: Matt Willsher Date: Sun, 4 Jan 2015 12:51:40 +0000 Subject: [PATCH] Merge from develop changes --- README.md | 2 +- templates/sshd_config.j2 | 2 +- vars/Archlinux.yml | 14 ++++++++++++++ vars/Debian.yml | 2 +- vars/RedHat_7.yml | 2 +- vars/Ubuntu.yml | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 vars/Archlinux.yml diff --git a/README.md b/README.md index 2288fa7..43b344e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ sshd_ListenAddress: sshd_skip_defaults: true sshd: Compression: true - ListenAddres: + ListenAddress: - "0.0.0.0" - "::" GSSAPIAuthentication: no diff --git a/templates/sshd_config.j2 b/templates/sshd_config.j2 index 54bbff9..71b87ff 100644 --- a/templates/sshd_config.j2 +++ b/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) -}} diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml new file mode 100644 index 0000000..c529f91 --- /dev/null +++ b/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 diff --git a/vars/Debian.yml b/vars/Debian.yml index b0676b4..40034e7 100644 --- a/vars/Debian.yml +++ b/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 diff --git a/vars/RedHat_7.yml b/vars/RedHat_7.yml index 92cbd08..80907ca 100644 --- a/vars/RedHat_7.yml +++ b/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 diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml index 9f3bb7b..f485ab4 100644 --- a/vars/Ubuntu.yml +++ b/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