From: nicoo <nicoo@realraum.at>
Date: Wed, 16 May 2018 21:00:17 +0000 (+0200)
Subject: tuer: Replace dropbear with openssh-server
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=462d5291a691cd8bd800a79b5feddcfae8ffa2e2;p=noc.git

tuer: Replace dropbear with openssh-server

This is a work-in-progress, the configuration is currently broken...

We use /etc/ssh/authorized_keys.d so non-root users cannot edit
authorized keys.
---

diff --git a/ansible/tuer.yml b/ansible/tuer.yml
index 004804d..e061759 100644
--- a/ansible/tuer.yml
+++ b/ansible/tuer.yml
@@ -62,6 +62,8 @@
           - nano
           - tcpdump
         openwrt_packages_extra:
+          - "-dropbear"
+          - openssh-server
           - git
 
         openwrt_mixin:
@@ -76,8 +78,20 @@
             mode: 0755
             file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/update-keys/update-keys"
 
-          /etc/dropbear/authorized_keys:
-            mode: 0600
+          /etc/ssh/sshd_config:
+            content: |-
+              Port 22000
+
+              AllowUsers root tuerctl tuergit
+              AuthenticationMethods publickey
+              AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u
+
+              AllowAgentForwarding no
+              AllowTcpForwarding no
+              X11Forwarding no
+              UsePrivilegeSeparation sandbox
+
+          /etc/ssh/authorized_keys.d/root:
             content: |-
               {% for key in noc_ssh_keys %}
               {{ key }}
@@ -107,12 +121,6 @@
                 dns: 192.168.33.1
                 dns_search: realraum.at
 
-          dropbear:
-            - name: dropbear
-              options:
-                PasswordAuth: off
-                RootPasswordAuth: off
-                Port: 22000
 
         openwrt_mounts:
           - path: /run