From 0c5c622904ccb3e0416ba72ff1731ece00fd03e6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 17 May 2020 03:46:29 +0200 Subject: enable apt-repo/base role on most hosts --- dan/common.yml | 1 + dan/ele-calypso.yml | 7 ------- dan/ele-dione.yml | 1 + dan/ele-gwhetzner.yml | 1 + dan/ele-helene.yml | 1 + dan/ele-lt.yml | 1 + dan/ele-media.yml | 1 + dan/ele-mur.yml | 1 + dan/ele-telesto.yml | 1 + dan/ele-thetys.yml | 1 + dan/ele-uhrturm.yml | 1 + dan/emc-master.yml | 1 + dan/emc-xx.yml | 1 + dan/k8s-emc.yml | 1 + dan/sk-2019.yml | 1 + dan/sk-torrent.yml | 1 + spreadspace/common.yml | 1 + spreadspace/k8s-lwl.yml | 1 + spreadspace/lendwirbel-live-xx.yml | 1 + spreadspace/lw-dione.yml | 1 + spreadspace/lw-helene.yml | 1 + spreadspace/lw-master.yml | 1 + spreadspace/lw-telesto.yml | 1 + spreadspace/lw-thetys.yml | 1 + spreadspace/s2-calypso.yml | 1 + spreadspace/s2-dione.yml | 1 + spreadspace/s2-helene.yml | 1 + spreadspace/s2-telesto.yml | 1 + spreadspace/s2-thetys.yml | 1 + 29 files changed, 28 insertions(+), 7 deletions(-) delete mode 100644 dan/ele-calypso.yml diff --git a/dan/common.yml b/dan/common.yml index 494f434f..59024522 100644 --- a/dan/common.yml +++ b/dan/common.yml @@ -5,3 +5,4 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base diff --git a/dan/ele-calypso.yml b/dan/ele-calypso.yml deleted file mode 100644 index e3f9527b..00000000 --- a/dan/ele-calypso.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Basic Setup - hosts: ele-calypso - roles: - - role: base - - role: sshd - - role: zsh diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml index e47165b0..19c27499 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-dione.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml index fb6defaa..660fa1fc 100644 --- a/dan/ele-gwhetzner.yml +++ b/dan/ele-gwhetzner.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: apt-repo/spreadspace - role: wireguard/base - role: wireguard/gateway diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index b365e082..12a75d69 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml index 98b4a73b..0670dc30 100644 --- a/dan/ele-lt.yml +++ b/dan/ele-lt.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: apt-repo/spreadspace - role: acmetool/base - role: nginx/base diff --git a/dan/ele-media.yml b/dan/ele-media.yml index e9c36495..662574ed 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: dyndns/client - role: apt-repo/spreadspace diff --git a/dan/ele-mur.yml b/dan/ele-mur.yml index 9da81b2f..4796a3c9 100644 --- a/dan/ele-mur.yml +++ b/dan/ele-mur.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base post_tasks: - name: install interface config for guest vlan copy: diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml index c2c4ccbd..c9448bb1 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-telesto.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index 4024989d..e9c78a06 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml index 5b88261e..63d1cc90 100644 --- a/dan/ele-uhrturm.yml +++ b/dan/ele-uhrturm.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/emc-master.yml b/dan/emc-master.yml index 89b27ebf..0676f843 100644 --- a/dan/emc-master.yml +++ b/dan/emc-master.yml @@ -5,4 +5,5 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: elevate/emc-stats diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml index eb9586ac..8a5549e3 100644 --- a/dan/emc-xx.yml +++ b/dan/emc-xx.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: apt-repo/spreadspace - role: acmetool/base - role: acmetool/cert diff --git a/dan/k8s-emc.yml b/dan/k8s-emc.yml index 273b1c1b..0ef38e13 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - import_playbook: ../common/kubernetes-cluster-layout.yml vars: diff --git a/dan/sk-2019.yml b/dan/sk-2019.yml index 3abc3ac9..8b9448ba 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + # - role: apt-repo/base ## TODO test this - role: admin-user - role: cryptdisk - role: zfs/base diff --git a/dan/sk-torrent.yml b/dan/sk-torrent.yml index f94dadab..c183ed40 100644 --- a/dan/sk-torrent.yml +++ b/dan/sk-torrent.yml @@ -5,5 +5,6 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: skillz/torrent diff --git a/spreadspace/common.yml b/spreadspace/common.yml index 494f434f..59024522 100644 --- a/spreadspace/common.yml +++ b/spreadspace/common.yml @@ -5,3 +5,4 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base diff --git a/spreadspace/k8s-lwl.yml b/spreadspace/k8s-lwl.yml index 2efc4f5f..3348894d 100644 --- a/spreadspace/k8s-lwl.yml +++ b/spreadspace/k8s-lwl.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - import_playbook: ../common/kubernetes-cluster-layout.yml vars: diff --git a/spreadspace/lendwirbel-live-xx.yml b/spreadspace/lendwirbel-live-xx.yml index eb9586ac..8a5549e3 100644 --- a/spreadspace/lendwirbel-live-xx.yml +++ b/spreadspace/lendwirbel-live-xx.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: apt-repo/spreadspace - role: acmetool/base - role: acmetool/cert diff --git a/spreadspace/lw-dione.yml b/spreadspace/lw-dione.yml index e310f4ff..1c38dc42 100644 --- a/spreadspace/lw-dione.yml +++ b/spreadspace/lw-dione.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml index 2d1ca12e..f1d816d1 100644 --- a/spreadspace/lw-helene.yml +++ b/spreadspace/lw-helene.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/spreadspace/lw-master.yml b/spreadspace/lw-master.yml index cc615a4c..7862a6b6 100644 --- a/spreadspace/lw-master.yml +++ b/spreadspace/lw-master.yml @@ -5,4 +5,5 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: elevate/emc-stats diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index ce2a801f..ebc4702e 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index ab4238f4..7129803a 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml index 81e13c62..7cf6086a 100644 --- a/spreadspace/s2-calypso.yml +++ b/spreadspace/s2-calypso.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml index 05bfb553..a48af66c 100644 --- a/spreadspace/s2-dione.yml +++ b/spreadspace/s2-dione.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml index debe0bc3..a585bfcf 100644 --- a/spreadspace/s2-helene.yml +++ b/spreadspace/s2-helene.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml index cb9dc7bd..42b0305c 100644 --- a/spreadspace/s2-telesto.yml +++ b/spreadspace/s2-telesto.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 1b52728d..0c9ae79f 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -5,6 +5,7 @@ - role: base - role: sshd - role: zsh + - role: apt-repo/base - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo -- cgit v1.2.3