From cca66452533feacdd98217de28f6aa2c52857c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Apr 2015 10:31:45 +0000
Subject: [PATCH] fix ssh.socket killmode

---
 roles/container/files/ssh_known_hosts    | 0
 roles/container/files/sshd-killmode.conf | 2 ++
 roles/container/tasks/ssh.yml            | 9 +++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 roles/container/files/ssh_known_hosts
 create mode 100644 roles/container/files/sshd-killmode.conf

diff --git a/roles/container/files/ssh_known_hosts b/roles/container/files/ssh_known_hosts
new file mode 100644
index 0000000..e69de29
diff --git a/roles/container/files/sshd-killmode.conf b/roles/container/files/sshd-killmode.conf
new file mode 100644
index 0000000..9fcabf6
--- /dev/null
+++ b/roles/container/files/sshd-killmode.conf
@@ -0,0 +1,2 @@
+[Service]
+KillMode=process
diff --git a/roles/container/tasks/ssh.yml b/roles/container/tasks/ssh.yml
index 2cf3180..d259660 100644
--- a/roles/container/tasks/ssh.yml
+++ b/roles/container/tasks/ssh.yml
@@ -1,5 +1,6 @@
 - name: install openssh
   pacman: name=openssh state=present
+
 - name: Write sshd_config
   template: src=sshd_config.j2 dest=/etc/ssh/sshd_config mode=0644
 - name: Write ssh_config
@@ -8,7 +9,15 @@
   copy: src=ssh_moduli dest=/etc/ssh/moduli mode=0644
 - name: create link-ptmx.service
   copy: src=link-ptmx.service dest=/etc/systemd/system/link-ptmx.service mode=0644
+
 - name: enable link-ptmx.service
   file: src=/etc/systemd/system/link-ptmx.service dest=/etc/systemd/system/multi-user.target.wants/link-ptmx.service state=link
+
 - name: start sshd.socket
   service: name=sshd.socket state=started enabled=yes
+
+- name: sshd.service.d
+  file: path=/etc/systemd/system/sshd.service.d/ state=directory
+- name: ssh service KillMode
+  copy: src=sshd-killmode.conf dest=/etc/systemd/system/sshd.service.d/killmode.conf
+  notify: Reload systemd