move core/sshd to core/sshd/base

21 files changed, 21 insertions, 21 deletions

diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml
index 2e60943b..e96fe807 100644
--- a/chaos-at-home/ch-atlas.yml
+++ b/chaos-at-home/ch-atlas.yml
@@ -2,7 +2,7 @@
 - name: Basic Setup
   hosts: ch-atlas
   roles:
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: vm/host/base
   - role: vm/host/network
diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml
index 962b9aa3..93bdea2f 100644
--- a/chaos-at-home/ch-calypso.yml
+++ b/chaos-at-home/ch-calypso.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/cpu-microcode
diff --git a/chaos-at-home/ch-dione.yml b/chaos-at-home/ch-dione.yml
index f69ef194..7465d38e 100644
--- a/chaos-at-home/ch-dione.yml
+++ b/chaos-at-home/ch-dione.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/cpu-microcode
diff --git a/chaos-at-home/ch-epimetheus.yml b/chaos-at-home/ch-epimetheus.yml
index 66fd2dc6..4e3a3296 100644
--- a/chaos-at-home/ch-epimetheus.yml
+++ b/chaos-at-home/ch-epimetheus.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: network/wakeonlan
diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml
index afc81fa3..e86f928d 100644
--- a/chaos-at-home/ch-equinox-t450s.yml
+++ b/chaos-at-home/ch-equinox-t450s.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
   - role: apt-repo/backports
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index 74410228..e3408c54 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
   - role: core/admin-users
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml
index 095948ad..ba7b9add 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/chaos-at-home/ch-gnocchi.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
   - role: vm/host/base
diff --git a/chaos-at-home/ch-helene.yml b/chaos-at-home/ch-helene.yml
index 893971a5..6ceb1c36 100644
--- a/chaos-at-home/ch-helene.yml
+++ b/chaos-at-home/ch-helene.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/cpu-microcode
diff --git a/chaos-at-home/ch-http-proxy.yml b/chaos-at-home/ch-http-proxy.yml
index 2b410433..9b731bfb 100644
--- a/chaos-at-home/ch-http-proxy.yml
+++ b/chaos-at-home/ch-http-proxy.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: apt-repo/spreadspace
   - role: acmetool/base
diff --git a/chaos-at-home/ch-imap-proxy.yml b/chaos-at-home/ch-imap-proxy.yml
index 967d7613..fd503a70 100644
--- a/chaos-at-home/ch-imap-proxy.yml
+++ b/chaos-at-home/ch-imap-proxy.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: apt-repo/spreadspace
   - role: acmetool/base
diff --git a/chaos-at-home/ch-jump.yml b/chaos-at-home/ch-jump.yml
index 5c170e07..92cf8804 100644
--- a/chaos-at-home/ch-jump.yml
+++ b/chaos-at-home/ch-jump.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/admin-users
diff --git a/chaos-at-home/ch-keyserver.yml b/chaos-at-home/ch-keyserver.yml
index aef2dc1f..11942ffc 100644
--- a/chaos-at-home/ch-keyserver.yml
+++ b/chaos-at-home/ch-keyserver.yml
@@ -4,6 +4,6 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/admin-users
diff --git a/chaos-at-home/ch-mc.yml b/chaos-at-home/ch-mc.yml
index 6f683d93..9f9e5b67 100644
--- a/chaos-at-home/ch-mc.yml
+++ b/chaos-at-home/ch-mc.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
   - role: network/wakeonlan
diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml
index d5cffd6d..ff8d3239 100644
--- a/chaos-at-home/ch-mimas2.yml
+++ b/chaos-at-home/ch-mimas2.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/admin-users
   - role: bind
diff --git a/chaos-at-home/ch-prometheus.yml b/chaos-at-home/ch-prometheus.yml
index d0a99cea..d7948562 100644
--- a/chaos-at-home/ch-prometheus.yml
+++ b/chaos-at-home/ch-prometheus.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
   - role: storage/luks/volumes
diff --git a/chaos-at-home/ch-router-obsd.yml b/chaos-at-home/ch-router-obsd.yml
index 12e95989..0bfc696a 100644
--- a/chaos-at-home/ch-router-obsd.yml
+++ b/chaos-at-home/ch-router-obsd.yml
@@ -3,5 +3,5 @@
   hosts: ch-router-obsd
   roles:
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml
index 9cbfbde3..b189ca98 100644
--- a/chaos-at-home/ch-telesto.yml
+++ b/chaos-at-home/ch-telesto.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/cpu-microcode
diff --git a/chaos-at-home/ch-thetys.yml b/chaos-at-home/ch-thetys.yml
index 5469add6..cb54fe53 100644
--- a/chaos-at-home/ch-thetys.yml
+++ b/chaos-at-home/ch-thetys.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: core/cpu-microcode
diff --git a/chaos-at-home/ch-vpn.yml b/chaos-at-home/ch-vpn.yml
index 1b197970..2d20e5bd 100644
--- a/chaos-at-home/ch-vpn.yml
+++ b/chaos-at-home/ch-vpn.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
   - role: apt-repo/spreadspace
diff --git a/chaos-at-home/common.yml b/chaos-at-home/common.yml
index 21d151fe..af4b4fda 100644
--- a/chaos-at-home/common.yml
+++ b/chaos-at-home/common.yml
@@ -5,6 +5,6 @@
   - role: apt-repo/base
     when: ansible_pkg_mgr == "apt"
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp
diff --git a/chaos-at-home/k8s-chtest.yml b/chaos-at-home/k8s-chtest.yml
index f5eda5cf..66e28426 100644
--- a/chaos-at-home/k8s-chtest.yml
+++ b/chaos-at-home/k8s-chtest.yml
@@ -4,7 +4,7 @@
   roles:
   - role: apt-repo/base
   - role: core/base
-  - role: core/sshd
+  - role: core/sshd/base
   - role: core/zsh
   - role: core/ntp