summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-atlas.yml4
-rw-r--r--chaos-at-home/ch-equinox-ws.yml6
-rw-r--r--chaos-at-home/ch-gnocchi.yml6
-rw-r--r--chaos-at-home/ch-hroottest.yml6
-rw-r--r--chaos-at-home/ch-jump.yml6
-rw-r--r--chaos-at-home/ch-keyserver.yml6
-rw-r--r--chaos-at-home/ch-mimas.yml2
-rw-r--r--chaos-at-home/ch-mimas2.yml6
-rw-r--r--chaos-at-home/ch-pan.yml2
-rw-r--r--chaos-at-home/common.yml6
-rw-r--r--chaos-at-home/r3-cccamp19_vm.yml6
-rw-r--r--dan/common.yml6
-rw-r--r--dan/ele-dione.yml6
-rw-r--r--dan/ele-dolmetsch-raspi.yml6
-rw-r--r--dan/ele-gwhetzner.yml6
-rw-r--r--dan/ele-helene.yml6
-rw-r--r--dan/ele-laptop.yml4
-rw-r--r--dan/ele-lt.yml6
-rw-r--r--dan/ele-media.yml6
-rw-r--r--dan/ele-mur.yml6
-rw-r--r--dan/ele-telesto.yml6
-rw-r--r--dan/ele-thetys.yml6
-rw-r--r--dan/ele-uhrturm.yml6
-rw-r--r--dan/emc-master.yml6
-rw-r--r--dan/emc-xx.yml6
-rw-r--r--dan/k8s-emc.yml6
-rw-r--r--dan/sk-2019.yml6
-rw-r--r--dan/sk-2019vm.yml6
-rw-r--r--dan/sk-cloudia.yml6
-rw-r--r--dan/sk-tomnext-nc.yml6
-rw-r--r--dan/sk-tomnext.yml6
-rw-r--r--dan/sk-torrent.yml6
-rw-r--r--roles/core/base/defaults/main.yml (renamed from roles/base/defaults/main.yml)0
-rw-r--r--roles/core/base/files/02no-recommends (renamed from roles/base/files/02no-recommends)0
-rw-r--r--roles/core/base/handlers/main.yml (renamed from roles/base/handlers/main.yml)0
-rw-r--r--roles/core/base/tasks/Debian.yml (renamed from roles/base/tasks/Debian.yml)0
-rw-r--r--roles/core/base/tasks/OpenBSD.yml (renamed from roles/base/tasks/OpenBSD.yml)0
-rw-r--r--roles/core/base/tasks/intel-nic.yml (renamed from roles/base/tasks/intel-nic.yml)0
-rw-r--r--roles/core/base/tasks/main.yml (renamed from roles/base/tasks/main.yml)0
-rw-r--r--roles/core/base/vars/Debian.yml (renamed from roles/base/vars/Debian.yml)0
-rw-r--r--roles/core/base/vars/Ubuntu.yml (renamed from roles/base/vars/Ubuntu.yml)0
-rw-r--r--roles/core/base/vars/main.yml (renamed from roles/base/vars/main.yml)0
-rw-r--r--roles/core/sshd/defaults/main.yml (renamed from roles/sshd/defaults/main.yml)0
-rw-r--r--roles/core/sshd/handlers/main.yml (renamed from roles/sshd/handlers/main.yml)0
-rw-r--r--roles/core/sshd/tasks/main.yml (renamed from roles/sshd/tasks/main.yml)0
-rw-r--r--roles/core/sshd/vars/Debian.yml (renamed from roles/sshd/vars/Debian.yml)0
-rw-r--r--roles/core/sshd/vars/OpenBSD.yml (renamed from roles/sshd/vars/OpenBSD.yml)0
-rw-r--r--roles/core/zsh/files/zshrc (renamed from roles/zsh/files/zshrc)0
-rw-r--r--roles/core/zsh/files/zshrc.skel (renamed from roles/zsh/files/zshrc.skel)0
-rw-r--r--roles/core/zsh/tasks/main.yml (renamed from roles/zsh/tasks/main.yml)0
-rw-r--r--roles/core/zsh/templates/banner.chaos-at-home.j2 (renamed from roles/zsh/templates/banner.chaos-at-home.j2)0
-rw-r--r--roles/core/zsh/templates/banner.elevate.j2 (renamed from roles/zsh/templates/banner.elevate.j2)0
-rw-r--r--roles/core/zsh/templates/banner.lendwirbel.j2 (renamed from roles/zsh/templates/banner.lendwirbel.j2)0
-rw-r--r--roles/core/zsh/templates/banner.skillz.j2 (renamed from roles/zsh/templates/banner.skillz.j2)0
-rw-r--r--roles/core/zsh/templates/banner.spreadspace.j2 (renamed from roles/zsh/templates/banner.spreadspace.j2)0
-rw-r--r--roles/core/zsh/vars/Debian.yml (renamed from roles/zsh/vars/Debian.yml)0
-rw-r--r--roles/core/zsh/vars/OpenBSD.yml (renamed from roles/zsh/vars/OpenBSD.yml)0
-rw-r--r--spreadspace/common.yml6
-rw-r--r--spreadspace/k8s-lwl.yml6
-rw-r--r--spreadspace/lendwirbel-live-xx.yml6
-rw-r--r--spreadspace/lw-dione.yml6
-rw-r--r--spreadspace/lw-helene.yml6
-rw-r--r--spreadspace/lw-master.yml6
-rw-r--r--spreadspace/lw-telesto.yml6
-rw-r--r--spreadspace/lw-thetys.yml6
-rw-r--r--spreadspace/s2-build.yml2
-rw-r--r--spreadspace/s2-calypso.yml6
-rw-r--r--spreadspace/s2-dione.yml6
-rw-r--r--spreadspace/s2-helene.yml6
-rw-r--r--spreadspace/s2-telesto.yml6
-rw-r--r--spreadspace/s2-thetys.yml6
71 files changed, 130 insertions, 130 deletions
diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml
index a1cd0b0c..887d6be3 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: sshd
- - role: zsh
+ - role: core/sshd
+ - role: core/zsh
- role: vm/host
- role: installer/debian/base
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index 5a52bbb7..b1486091 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ch-equinox-ws
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: admin-user
- role: apt-repo/base
- role: apt-repo/backports
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml
index d6d6e033..b1092427 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/chaos-at-home/ch-gnocchi.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ch-gnocchi
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: vm/host
- role: installer/debian/base
diff --git a/chaos-at-home/ch-hroottest.yml b/chaos-at-home/ch-hroottest.yml
index 52be7e88..bb800f5d 100644
--- a/chaos-at-home/ch-hroottest.yml
+++ b/chaos-at-home/ch-hroottest.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ch-hroottest
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: zfs/base
- role: apt-repo/spreadspace
diff --git a/chaos-at-home/ch-jump.yml b/chaos-at-home/ch-jump.yml
index ba7e640d..82013d21 100644
--- a/chaos-at-home/ch-jump.yml
+++ b/chaos-at-home/ch-jump.yml
@@ -2,8 +2,8 @@
- name: Basic Setup
hosts: ch-jump
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
diff --git a/chaos-at-home/ch-keyserver.yml b/chaos-at-home/ch-keyserver.yml
index 9b032bb3..689d9d36 100644
--- a/chaos-at-home/ch-keyserver.yml
+++ b/chaos-at-home/ch-keyserver.yml
@@ -2,8 +2,8 @@
- name: Basic Setup
hosts: ch-keyserver
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
diff --git a/chaos-at-home/ch-mimas.yml b/chaos-at-home/ch-mimas.yml
index 0614b5ac..51a16ca9 100644
--- a/chaos-at-home/ch-mimas.yml
+++ b/chaos-at-home/ch-mimas.yml
@@ -2,5 +2,5 @@
- name: Basic Setup
hosts: ch-mimas
roles:
- - role: zsh
+ - role: core/zsh
- role: apt-repo/spreadspace
diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml
index 78d90c1f..c458922b 100644
--- a/chaos-at-home/ch-mimas2.yml
+++ b/chaos-at-home/ch-mimas2.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ch-mimas2
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: bind
diff --git a/chaos-at-home/ch-pan.yml b/chaos-at-home/ch-pan.yml
index 027f2096..bbcee452 100644
--- a/chaos-at-home/ch-pan.yml
+++ b/chaos-at-home/ch-pan.yml
@@ -2,5 +2,5 @@
- name: Basic Setup
hosts: ch-pan
roles:
- - role: zsh
+ - role: core/zsh
- role: apt-repo/spreadspace
diff --git a/chaos-at-home/common.yml b/chaos-at-home/common.yml
index 59024522..22997e3f 100644
--- a/chaos-at-home/common.yml
+++ b/chaos-at-home/common.yml
@@ -2,7 +2,7 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
diff --git a/chaos-at-home/r3-cccamp19_vm.yml b/chaos-at-home/r3-cccamp19_vm.yml
index ca8d230b..ef53187f 100644
--- a/chaos-at-home/r3-cccamp19_vm.yml
+++ b/chaos-at-home/r3-cccamp19_vm.yml
@@ -2,7 +2,7 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: dyndns/client
diff --git a/dan/common.yml b/dan/common.yml
index 59024522..22997e3f 100644
--- a/dan/common.yml
+++ b/dan/common.yml
@@ -2,7 +2,7 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml
index 19c27499..62a26a01 100644
--- a/dan/ele-dione.yml
+++ b/dan/ele-dione.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-dione
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml
index daf4e3b4..eb59baf3 100644
--- a/dan/ele-dolmetsch-raspi.yml
+++ b/dan/ele-dolmetsch-raspi.yml
@@ -3,7 +3,7 @@
hosts: ele-dolmetsch-raspi
roles:
- role: slim/raspbian
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: elevate/dolmetsch-raspi
diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml
index 660fa1fc..22a7e447 100644
--- a/dan/ele-gwhetzner.yml
+++ b/dan/ele-gwhetzner.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-gwhetzner
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: apt-repo/spreadspace
- role: wireguard/base
diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml
index 12a75d69..6e5204dc 100644
--- a/dan/ele-helene.yml
+++ b/dan/ele-helene.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-helene
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/dan/ele-laptop.yml b/dan/ele-laptop.yml
index 2435529f..86a3131b 100644
--- a/dan/ele-laptop.yml
+++ b/dan/ele-laptop.yml
@@ -2,5 +2,5 @@
- name: Basic Setup
hosts: ele-laptop
roles:
- - role: sshd
- - role: zsh
+ - role: core/sshd
+ - role: core/zsh
diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml
index 0670dc30..139f13da 100644
--- a/dan/ele-lt.yml
+++ b/dan/ele-lt.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-lt
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: apt-repo/spreadspace
- role: acmetool/base
diff --git a/dan/ele-media.yml b/dan/ele-media.yml
index 662574ed..5e0cf970 100644
--- a/dan/ele-media.yml
+++ b/dan/ele-media.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-media
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: dyndns/client
diff --git a/dan/ele-mur.yml b/dan/ele-mur.yml
index 4796a3c9..da04fdb4 100644
--- a/dan/ele-mur.yml
+++ b/dan/ele-mur.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-mur
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
post_tasks:
- name: install interface config for guest vlan
diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml
index c9448bb1..f3089925 100644
--- a/dan/ele-telesto.yml
+++ b/dan/ele-telesto.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-telesto
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml
index e9c78a06..6e5be4e1 100644
--- a/dan/ele-thetys.yml
+++ b/dan/ele-thetys.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-thetys
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml
index 63d1cc90..71326514 100644
--- a/dan/ele-uhrturm.yml
+++ b/dan/ele-uhrturm.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: ele-uhrturm
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/dan/emc-master.yml b/dan/emc-master.yml
index 0676f843..adf3ad98 100644
--- a/dan/emc-master.yml
+++ b/dan/emc-master.yml
@@ -2,8 +2,8 @@
- name: Basic Setup
hosts: emc-master
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: elevate/emc-stats
diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml
index 8a5549e3..ccd7b962 100644
--- a/dan/emc-xx.yml
+++ b/dan/emc-xx.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: apt-repo/spreadspace
- role: acmetool/base
diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml
index 0ef38e13..d7987021 100644
--- a/dan/k8s-emc.yml
+++ b/dan/k8s-emc.yml
@@ -2,9 +2,9 @@
- name: Basic Node Setup
hosts: k8s-emc
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- import_playbook: ../common/kubernetes-cluster-layout.yml
diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml
index e34218f5..20d728c5 100644
--- a/dan/sk-2019.yml
+++ b/dan/sk-2019.yml
@@ -5,9 +5,9 @@
- debug:
msg: "please use the branch topic/skillz-legacy for this host"
#roles:
- # - role: base
- # - role: sshd
- # - role: zsh
+ # - role: core/base
+ # - role: core/sshd
+ # - role: core/zsh
# # - role: apt-repo/base ## TODO test this
# - role: admin-user
# - role: cryptdisk
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index 0aa1ed31..ff8e0052 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: sk-2019vm
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: cryptdisk
diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml
index ceb2c001..a8eebed1 100644
--- a/dan/sk-cloudia.yml
+++ b/dan/sk-cloudia.yml
@@ -5,9 +5,9 @@
- debug:
msg: "please use the branch topic/skillz-legacy for this host"
#roles:
- # - role: base
- # - role: sshd
- # - role: zsh
+ # - role: core/base
+ # - role: core/sshd
+ # - role: core/zsh
# - role: apt-repo/base
# - role: admin-user
# - role: zfs/base
diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml
index 8f12f99d..12bf01ba 100644
--- a/dan/sk-tomnext-nc.yml
+++ b/dan/sk-tomnext-nc.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: sk-tomnext-nc
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: zfs/base
diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml
index d5d0fec6..3d2991a9 100644
--- a/dan/sk-tomnext.yml
+++ b/dan/sk-tomnext.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: sk-tomnext
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: cryptdisk
diff --git a/dan/sk-torrent.yml b/dan/sk-torrent.yml
index c183ed40..ee80932b 100644
--- a/dan/sk-torrent.yml
+++ b/dan/sk-torrent.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: sk-torrent
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: skillz/torrent
diff --git a/roles/base/defaults/main.yml b/roles/core/base/defaults/main.yml
index c4b0d42c..c4b0d42c 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/core/base/defaults/main.yml
diff --git a/roles/base/files/02no-recommends b/roles/core/base/files/02no-recommends
index a2fba330..a2fba330 100644
--- a/roles/base/files/02no-recommends
+++ b/roles/core/base/files/02no-recommends
diff --git a/roles/base/handlers/main.yml b/roles/core/base/handlers/main.yml
index a23868cf..a23868cf 100644
--- a/roles/base/handlers/main.yml
+++ b/roles/core/base/handlers/main.yml
diff --git a/roles/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml
index 13c3c9f9..13c3c9f9 100644
--- a/roles/base/tasks/Debian.yml
+++ b/roles/core/base/tasks/Debian.yml
diff --git a/roles/base/tasks/OpenBSD.yml b/roles/core/base/tasks/OpenBSD.yml
index 4b64105c..4b64105c 100644
--- a/roles/base/tasks/OpenBSD.yml
+++ b/roles/core/base/tasks/OpenBSD.yml
diff --git a/roles/base/tasks/intel-nic.yml b/roles/core/base/tasks/intel-nic.yml
index 2b9be474..2b9be474 100644
--- a/roles/base/tasks/intel-nic.yml
+++ b/roles/core/base/tasks/intel-nic.yml
diff --git a/roles/base/tasks/main.yml b/roles/core/base/tasks/main.yml
index 5484a3a6..5484a3a6 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/core/base/tasks/main.yml
diff --git a/roles/base/vars/Debian.yml b/roles/core/base/vars/Debian.yml
index 96baf89b..96baf89b 100644
--- a/roles/base/vars/Debian.yml
+++ b/roles/core/base/vars/Debian.yml
diff --git a/roles/base/vars/Ubuntu.yml b/roles/core/base/vars/Ubuntu.yml
index eb2591da..eb2591da 100644
--- a/roles/base/vars/Ubuntu.yml
+++ b/roles/core/base/vars/Ubuntu.yml
diff --git a/roles/base/vars/main.yml b/roles/core/base/vars/main.yml
index 9940d7a6..9940d7a6 100644
--- a/roles/base/vars/main.yml
+++ b/roles/core/base/vars/main.yml
diff --git a/roles/sshd/defaults/main.yml b/roles/core/sshd/defaults/main.yml
index 8b25827b..8b25827b 100644
--- a/roles/sshd/defaults/main.yml
+++ b/roles/core/sshd/defaults/main.yml
diff --git a/roles/sshd/handlers/main.yml b/roles/core/sshd/handlers/main.yml
index ea76595a..ea76595a 100644
--- a/roles/sshd/handlers/main.yml
+++ b/roles/core/sshd/handlers/main.yml
diff --git a/roles/sshd/tasks/main.yml b/roles/core/sshd/tasks/main.yml
index 5eb15081..5eb15081 100644
--- a/roles/sshd/tasks/main.yml
+++ b/roles/core/sshd/tasks/main.yml
diff --git a/roles/sshd/vars/Debian.yml b/roles/core/sshd/vars/Debian.yml
index abbccabc..abbccabc 100644
--- a/roles/sshd/vars/Debian.yml
+++ b/roles/core/sshd/vars/Debian.yml
diff --git a/roles/sshd/vars/OpenBSD.yml b/roles/core/sshd/vars/OpenBSD.yml
index abdaf180..abdaf180 100644
--- a/roles/sshd/vars/OpenBSD.yml
+++ b/roles/core/sshd/vars/OpenBSD.yml
diff --git a/roles/zsh/files/zshrc b/roles/core/zsh/files/zshrc
index 6b289404..6b289404 100644
--- a/roles/zsh/files/zshrc
+++ b/roles/core/zsh/files/zshrc
diff --git a/roles/zsh/files/zshrc.skel b/roles/core/zsh/files/zshrc.skel
index 8695b4db..8695b4db 100644
--- a/roles/zsh/files/zshrc.skel
+++ b/roles/core/zsh/files/zshrc.skel
diff --git a/roles/zsh/tasks/main.yml b/roles/core/zsh/tasks/main.yml
index a5ae60ec..a5ae60ec 100644
--- a/roles/zsh/tasks/main.yml
+++ b/roles/core/zsh/tasks/main.yml
diff --git a/roles/zsh/templates/banner.chaos-at-home.j2 b/roles/core/zsh/templates/banner.chaos-at-home.j2
index c0e71647..c0e71647 100644
--- a/roles/zsh/templates/banner.chaos-at-home.j2
+++ b/roles/core/zsh/templates/banner.chaos-at-home.j2
diff --git a/roles/zsh/templates/banner.elevate.j2 b/roles/core/zsh/templates/banner.elevate.j2
index 03dfa73b..03dfa73b 100644
--- a/roles/zsh/templates/banner.elevate.j2
+++ b/roles/core/zsh/templates/banner.elevate.j2
diff --git a/roles/zsh/templates/banner.lendwirbel.j2 b/roles/core/zsh/templates/banner.lendwirbel.j2
index f0aba5b5..f0aba5b5 100644
--- a/roles/zsh/templates/banner.lendwirbel.j2
+++ b/roles/core/zsh/templates/banner.lendwirbel.j2
diff --git a/roles/zsh/templates/banner.skillz.j2 b/roles/core/zsh/templates/banner.skillz.j2
index 4c883d22..4c883d22 100644
--- a/roles/zsh/templates/banner.skillz.j2
+++ b/roles/core/zsh/templates/banner.skillz.j2
diff --git a/roles/zsh/templates/banner.spreadspace.j2 b/roles/core/zsh/templates/banner.spreadspace.j2
index c592804e..c592804e 100644
--- a/roles/zsh/templates/banner.spreadspace.j2
+++ b/roles/core/zsh/templates/banner.spreadspace.j2
diff --git a/roles/zsh/vars/Debian.yml b/roles/core/zsh/vars/Debian.yml
index 7138fd2f..7138fd2f 100644
--- a/roles/zsh/vars/Debian.yml
+++ b/roles/core/zsh/vars/Debian.yml
diff --git a/roles/zsh/vars/OpenBSD.yml b/roles/core/zsh/vars/OpenBSD.yml
index d11fe11e..d11fe11e 100644
--- a/roles/zsh/vars/OpenBSD.yml
+++ b/roles/core/zsh/vars/OpenBSD.yml
diff --git a/spreadspace/common.yml b/spreadspace/common.yml
index 59024522..22997e3f 100644
--- a/spreadspace/common.yml
+++ b/spreadspace/common.yml
@@ -2,7 +2,7 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
diff --git a/spreadspace/k8s-lwl.yml b/spreadspace/k8s-lwl.yml
index 3348894d..b928cbd5 100644
--- a/spreadspace/k8s-lwl.yml
+++ b/spreadspace/k8s-lwl.yml
@@ -2,9 +2,9 @@
- name: Basic Node Setup
hosts: k8s-lwl
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- import_playbook: ../common/kubernetes-cluster-layout.yml
diff --git a/spreadspace/lendwirbel-live-xx.yml b/spreadspace/lendwirbel-live-xx.yml
index 8a5549e3..ccd7b962 100644
--- a/spreadspace/lendwirbel-live-xx.yml
+++ b/spreadspace/lendwirbel-live-xx.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: "{{ install_hostname }}"
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: apt-repo/spreadspace
- role: acmetool/base
diff --git a/spreadspace/lw-dione.yml b/spreadspace/lw-dione.yml
index 1c38dc42..145a3915 100644
--- a/spreadspace/lw-dione.yml
+++ b/spreadspace/lw-dione.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: lw-dione
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml
index f1d816d1..757f9ff6 100644
--- a/spreadspace/lw-helene.yml
+++ b/spreadspace/lw-helene.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: lw-helene
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-master.yml b/spreadspace/lw-master.yml
index 7862a6b6..8490dfa0 100644
--- a/spreadspace/lw-master.yml
+++ b/spreadspace/lw-master.yml
@@ -2,8 +2,8 @@
- name: Basic Setup
hosts: lw-master
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: elevate/emc-stats
diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml
index ebc4702e..53ad2a60 100644
--- a/spreadspace/lw-telesto.yml
+++ b/spreadspace/lw-telesto.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: lw-telesto
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml
index 7129803a..84885b31 100644
--- a/spreadspace/lw-thetys.yml
+++ b/spreadspace/lw-thetys.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: lw-thetys
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/spreadspace/s2-build.yml b/spreadspace/s2-build.yml
index 0fc9de6e..72e52acf 100644
--- a/spreadspace/s2-build.yml
+++ b/spreadspace/s2-build.yml
@@ -2,4 +2,4 @@
- name: Basic Setup
hosts: s2-build
roles:
- - role: zsh
+ - role: core/zsh
diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml
index 7cf6086a..5f39bcfa 100644
--- a/spreadspace/s2-calypso.yml
+++ b/spreadspace/s2-calypso.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: s2-calypso
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: apt-repo/spreadspace
diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml
index a48af66c..0ada118f 100644
--- a/spreadspace/s2-dione.yml
+++ b/spreadspace/s2-dione.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: s2-dione
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: apt-repo/spreadspace
diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml
index a585bfcf..c0bc1100 100644
--- a/spreadspace/s2-helene.yml
+++ b/spreadspace/s2-helene.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: s2-helene
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: apt-repo/spreadspace
diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml
index 42b0305c..6ac4787e 100644
--- a/spreadspace/s2-telesto.yml
+++ b/spreadspace/s2-telesto.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: s2-telesto
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: blackmagic-desktopvideo
diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml
index 0c9ae79f..10da8f15 100644
--- a/spreadspace/s2-thetys.yml
+++ b/spreadspace/s2-thetys.yml
@@ -2,9 +2,9 @@
- name: Basic Setup
hosts: s2-thetys
roles:
- - role: base
- - role: sshd
- - role: zsh
+ - role: core/base
+ - role: core/sshd
+ - role: core/zsh
- role: apt-repo/base
- role: admin-user
- role: apt-repo/spreadspace