move core roles to subdir

21 files changed, 62 insertions, 62 deletions

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