From f36d32e83376f088a93fc65d4795a95773b6d17c Mon Sep 17 00:00:00 2001
From: Harald Koch <chk@anemone.chk.cfrq.net>
Date: Sat, 11 Feb 2017 11:11:18 -0500
Subject: [PATCH] cleanup Archlinux support to match defaults in current
 package (openssh-7.4p1-2)

---
 defaults/main.yml  | 2 +-
 vars/Archlinux.yml | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 62ca56d..b27764b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,7 +8,7 @@ sshd_manage_service: "{{ false if ansible_virtualization_type == 'docker' else t
 # If the below is false, don't reload the ssh deamon on change
 sshd_allow_reload: "{{ sshd_manage_service }}"
 # If the below is false, don't manage /var/run/sshd directory
-sshd_manage_var_run: "{{ false if ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' else true }}"
+sshd_manage_var_run: "{{ false if ansible_os_family == 'Archlinux' or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') else true }}"
 # Empty dicts to avoid errors
 sshd: {}
 
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
index ccdc2e5..121be90 100644
--- a/vars/Archlinux.yml
+++ b/vars/Archlinux.yml
@@ -1,15 +1,11 @@
 ---
-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
 sshd_os_supported: yes