From 1a6f23070276532ea4ae0963acf6bb011e1688f2 Mon Sep 17 00:00:00 2001
From: Jonas Forsberg <jonas.forsberg@suse.com>
Date: Tue, 12 Oct 2021 10:15:14 +0200
Subject: [PATCH] .

---
 salt/pillars/ssh.sls     | 2 ++
 salt/pillars/top.sls     | 1 +
 salt/states/ssh/init.sls | 7 +++++++
 tlumon/tlumon            | 1 +
 4 files changed, 11 insertions(+)
 create mode 100644 salt/pillars/ssh.sls
 create mode 100644 salt/states/ssh/init.sls

diff --git a/salt/pillars/ssh.sls b/salt/pillars/ssh.sls
new file mode 100644
index 0000000..75d237c
--- /dev/null
+++ b/salt/pillars/ssh.sls
@@ -0,0 +1,2 @@
+ssh:
+  user-pub-keys: []
diff --git a/salt/pillars/top.sls b/salt/pillars/top.sls
index 98b94e5..a641a35 100644
--- a/salt/pillars/top.sls
+++ b/salt/pillars/top.sls
@@ -6,6 +6,7 @@ base:
     - rmt
     - docker
     - remote-desktop
+    - ssh
 {% if salt['pillar.file_exists']('local.sls') %}
     - local
 {% endif %}
diff --git a/salt/states/ssh/init.sls b/salt/states/ssh/init.sls
new file mode 100644
index 0000000..c6956c0
--- /dev/null
+++ b/salt/states/ssh/init.sls
@@ -0,0 +1,7 @@
+{% if pillar['ssh']['user-pub-keys'] %}
+{{ pillar['username'] }}_autherized_keys:
+  ssh_auth:
+    - present
+    - user: {{ pillar['username'] }}
+    - names: {{ pillar['ssh']['user-pub-keys'] }}
+{% endif %}
diff --git a/tlumon/tlumon b/tlumon/tlumon
index ce344f7..d19fae0 100755
--- a/tlumon/tlumon
+++ b/tlumon/tlumon
@@ -81,6 +81,7 @@ class Main:
                     "rmt-server-mirror.timer",
                     "rmt-server-systems-scc-sync.timer",
                     "atftpd.socket",
+                    "dnsmasq",
                     "mariadb"
                     ]