diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-04-11 18:15:17 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-04-11 18:15:17 +0200 |
| commit | d0b7421c2fe72299dc9b510d51821232cb95054a (patch) | |
| tree | 5cd324184ce694e9cadeab3c767038ad147b7a9a | |
| parent | add new config file barrier for core/sshd (diff) | |
move core/sshd to core/sshd/base
70 files changed, 78 insertions, 70 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 diff --git a/dan/common.yml b/dan/common.yml index 21d151fe..af4b4fda 100644 --- a/dan/common.yml +++ b/dan/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/dan/ele-dione.yml b/dan/ele-dione.yml index 742598a8..ca04c441 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-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/cpu-microcode - role: core/ntp diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml index eb59baf3..be9788e7 100644 --- a/dan/ele-dolmetsch-raspi.yml +++ b/dan/ele-dolmetsch-raspi.yml @@ -4,6 +4,6 @@ roles: - role: slim/raspbian - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh - role: elevate/dolmetsch-raspi diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml index 7efdef20..01e0681e 100644 --- a/dan/ele-gwhetzner.yml +++ b/dan/ele-gwhetzner.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: network/wireguard/base diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index 88fae823..172946f1 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-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/cpu-microcode - role: core/ntp diff --git a/dan/ele-laptop.yml b/dan/ele-laptop.yml index 86a3131b..bbc75bcd 100644 --- a/dan/ele-laptop.yml +++ b/dan/ele-laptop.yml @@ -2,5 +2,5 @@ - name: Basic Setup hosts: ele-laptop roles: - - role: core/sshd + - role: core/sshd/base - role: core/zsh diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml index b2776953..6749d744 100644 --- a/dan/ele-lt.yml +++ b/dan/ele-lt.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/dan/ele-media.yml b/dan/ele-media.yml index 7c92ae66..4464a7e4 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.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/dan/ele-mur.yml b/dan/ele-mur.yml index f29ba87a..967a4c01 100644 --- a/dan/ele-mur.yml +++ b/dan/ele-mur.yml @@ -4,7 +4,7 @@ roles: - role: apt-repo/base - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh post_tasks: - name: install interface config for guest vlan diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml index 11f21ef0..94adf08d 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-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/cpu-microcode - role: core/admin-users diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index 9c5f8362..340db6bc 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-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/cpu-microcode - role: core/admin-users diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml index 4e6da456..afbe781d 100644 --- a/dan/ele-uhrturm.yml +++ b/dan/ele-uhrturm.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/dan/emc-master.yml b/dan/emc-master.yml index 03ca70cf..839efc43 100644 --- a/dan/emc-master.yml +++ b/dan/emc-master.yml @@ -4,7 +4,7 @@ roles: - role: apt-repo/base - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh - role: storage/lvm/groups - role: elevate/emc-stats diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml index 3964cf9a..82a45785 100644 --- a/dan/emc-xx.yml +++ b/dan/emc-xx.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/dan/k8s-emc.yml b/dan/k8s-emc.yml index d81d8358..bccda74e 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -4,7 +4,7 @@ roles: - role: apt-repo/base - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh - import_playbook: ../common/kubernetes-cluster-layout.yml diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index 05cbefd1..c720dcc6 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.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/dan/sk-2019vm.yml b/dan/sk-2019vm.yml index 4a137461..d93dbdfd 100644 --- a/dan/sk-2019vm.yml +++ b/dan/sk-2019vm.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/dan/sk-cloudio.yml b/dan/sk-cloudio.yml index a23368b5..2dccf062 100644 --- a/dan/sk-cloudio.yml +++ b/dan/sk-cloudio.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/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index 0349d69d..56514e64 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.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: storage/zfs/pools diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml index ca26f166..96c0fe21 100644 --- a/dan/sk-tomnext.yml +++ b/dan/sk-tomnext.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/dan/sk-torrent.yml b/dan/sk-torrent.yml index 594f9f53..cd29e91d 100644 --- a/dan/sk-torrent.yml +++ b/dan/sk-torrent.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: skillz/torrent diff --git a/roles/core/sshd/defaults/main.yml b/roles/core/sshd/base/defaults/main.yml index 50cc0f15..50cc0f15 100644 --- a/roles/core/sshd/defaults/main.yml +++ b/roles/core/sshd/base/defaults/main.yml diff --git a/roles/core/sshd/handlers/main.yml b/roles/core/sshd/base/handlers/main.yml index ea76595a..ea76595a 100644 --- a/roles/core/sshd/handlers/main.yml +++ b/roles/core/sshd/base/handlers/main.yml diff --git a/roles/core/sshd/tasks/main.yml b/roles/core/sshd/base/tasks/main.yml index 61bd334f..d7524ef7 100644 --- a/roles/core/sshd/tasks/main.yml +++ b/roles/core/sshd/base/tasks/main.yml @@ -23,7 +23,7 @@ dest: /etc/ssh/sshd_config regexp: "^#?\\s*{{ item.key }}\\s" line: "{{ item.key }} {{ item.value }}" - insertbefore: '^### ansible core/sshd config barrier ###' + insertbefore: '^### ansible core/sshd/base config barrier ###' notify: restart ssh - name: limit allowed users @@ -32,7 +32,7 @@ dest: /etc/ssh/sshd_config regexp: "^AllowUsers\\s" line: "AllowUsers {{ ' '.join([ 'root' ] | union(sshd_allowusers_group) | union(sshd_allowusers_host)) }}" - insertbefore: '^### ansible core/sshd config barrier ###' + insertbefore: '^### ansible core/sshd/base config barrier ###' notify: restart ssh - name: allow any user @@ -43,11 +43,19 @@ state: absent notify: restart ssh -- name: install config barrier for other roles to use +- name: install config barriers for other roles to use + loop: + - line: "### ansible core/sshd/base config barrier ###" + insertbefore: "### ansible core/sshd config barrier ###" + - line: "### ansible core/sshd config barrier ###" + insertafter: "### ansible core/sshd/base config barrier ###" + loop_control: + label: "{{ item.line }}" lineinfile: dest: /etc/ssh/sshd_config - line: "### ansible core/sshd config barrier ###" - insertafter: EOF + line: "{{ item.line }}" + insertbefore: "{{ item.insertbefore | default(omit) }}" + insertafter: "{{ item.insertafter | default(omit) }}" notify: restart ssh - name: install ssh keys for root diff --git a/roles/core/sshd/vars/Debian.yml b/roles/core/sshd/base/vars/Debian.yml index abbccabc..abbccabc 100644 --- a/roles/core/sshd/vars/Debian.yml +++ b/roles/core/sshd/base/vars/Debian.yml diff --git a/roles/core/sshd/vars/OpenBSD.yml b/roles/core/sshd/base/vars/OpenBSD.yml index abdaf180..abdaf180 100644 --- a/roles/core/sshd/vars/OpenBSD.yml +++ b/roles/core/sshd/base/vars/OpenBSD.yml diff --git a/spreadspace/common.yml b/spreadspace/common.yml index 21d151fe..af4b4fda 100644 --- a/spreadspace/common.yml +++ b/spreadspace/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/spreadspace/glt-calypso.yml b/spreadspace/glt-calypso.yml index e9c05d92..62f27950 100644 --- a/spreadspace/glt-calypso.yml +++ b/spreadspace/glt-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/spreadspace/glt-coturn.yml b/spreadspace/glt-coturn.yml index 3300c6ba..f0b4b1d2 100644 --- a/spreadspace/glt-coturn.yml +++ b/spreadspace/glt-coturn.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: kubernetes/base diff --git a/spreadspace/glt-datacop.yml b/spreadspace/glt-datacop.yml index b3fb9005..1ffa07d5 100644 --- a/spreadspace/glt-datacop.yml +++ b/spreadspace/glt-datacop.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/spreadspace/glt-dione.yml b/spreadspace/glt-dione.yml index 3c895836..4c0d9329 100644 --- a/spreadspace/glt-dione.yml +++ b/spreadspace/glt-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/spreadspace/glt-helene.yml b/spreadspace/glt-helene.yml index 87a8910e..032af506 100644 --- a/spreadspace/glt-helene.yml +++ b/spreadspace/glt-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/spreadspace/glt-jitsi.yml b/spreadspace/glt-jitsi.yml index b644d02f..1721b1c6 100644 --- a/spreadspace/glt-jitsi.yml +++ b/spreadspace/glt-jitsi.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: kubernetes/base diff --git a/spreadspace/glt-stream.yml b/spreadspace/glt-stream.yml index 83d0f808..8d3ea790 100644 --- a/spreadspace/glt-stream.yml +++ b/spreadspace/glt-stream.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/spreadspace/glt-telesto.yml b/spreadspace/glt-telesto.yml index 25a256cb..c200e83b 100644 --- a/spreadspace/glt-telesto.yml +++ b/spreadspace/glt-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/spreadspace/glt-thetys.yml b/spreadspace/glt-thetys.yml index 9454142f..36c157bb 100644 --- a/spreadspace/glt-thetys.yml +++ b/spreadspace/glt-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/spreadspace/k8s-lwl.yml b/spreadspace/k8s-lwl.yml index 902d833d..01801633 100644 --- a/spreadspace/k8s-lwl.yml +++ b/spreadspace/k8s-lwl.yml @@ -4,7 +4,7 @@ roles: - role: apt-repo/base - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh - import_playbook: ../common/kubernetes-cluster-layout.yml diff --git a/spreadspace/lendwirbel-live-xx.yml b/spreadspace/lendwirbel-live-xx.yml index 3964cf9a..82a45785 100644 --- a/spreadspace/lendwirbel-live-xx.yml +++ b/spreadspace/lendwirbel-live-xx.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/spreadspace/lw-dione.yml b/spreadspace/lw-dione.yml index edc2e97b..af214d7f 100644 --- a/spreadspace/lw-dione.yml +++ b/spreadspace/lw-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/cpu-microcode - role: core/ntp diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml index cbf9f3b9..a9466c66 100644 --- a/spreadspace/lw-helene.yml +++ b/spreadspace/lw-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/cpu-microcode - role: core/ntp diff --git a/spreadspace/lw-master.yml b/spreadspace/lw-master.yml index c4a5df65..0f6f9390 100644 --- a/spreadspace/lw-master.yml +++ b/spreadspace/lw-master.yml @@ -4,7 +4,7 @@ roles: - role: apt-repo/base - role: core/base - - role: core/sshd + - role: core/sshd/base - role: core/zsh - role: storage/lvm/groups - role: elevate/emc-stats diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index 62a0348d..ddac511b 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index bc35fd90..f32496af 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml index cad94c38..126f13b0 100644 --- a/spreadspace/s2-calypso.yml +++ b/spreadspace/s2-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml index fa4f9344..dfe85b98 100644 --- a/spreadspace/s2-dione.yml +++ b/spreadspace/s2-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml index 1abaa383..e118db1f 100644 --- a/spreadspace/s2-helene.yml +++ b/spreadspace/s2-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/s2-mr-snuggles.yml b/spreadspace/s2-mr-snuggles.yml index 036b3017..b8427fed 100644 --- a/spreadspace/s2-mr-snuggles.yml +++ b/spreadspace/s2-mr-snuggles.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/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml index 83e4714d..91a948d8 100644 --- a/spreadspace/s2-telesto.yml +++ b/spreadspace/s2-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/cpu-microcode - role: core/admin-users diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index a3edf5c2..bebbd164 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-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/cpu-microcode - role: apt-repo/spreadspace |