diff options
44 files changed, 95 insertions, 41 deletions
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index b1486091..b6f5fd37 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -2,11 +2,12 @@ - name: Basic Setup hosts: ch-equinox-ws roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh + - role: core/cpu-microcode - role: admin-user - - role: apt-repo/base - role: apt-repo/backports - role: apt-repo/spreadspace - role: apt-repo/tor-project diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml index b1092427..c3811c50 100644 --- a/chaos-at-home/ch-gnocchi.yml +++ b/chaos-at-home/ch-gnocchi.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ch-gnocchi roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: vm/host - role: installer/debian/base - role: installer/openbsd/base diff --git a/chaos-at-home/ch-hroottest.yml b/chaos-at-home/ch-hroottest.yml index bb800f5d..064bea36 100644 --- a/chaos-at-home/ch-hroottest.yml +++ b/chaos-at-home/ch-hroottest.yml @@ -2,12 +2,14 @@ - name: Basic Setup hosts: ch-hroottest roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: zfs/base - role: apt-repo/spreadspace - role: zfs/sanoid - role: vm/host - role: installer/debian/base + - role: installer/openbsd/base diff --git a/chaos-at-home/ch-jump.yml b/chaos-at-home/ch-jump.yml index 82013d21..b097c4ee 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: apt-repo/base - 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 689d9d36..c745ea99 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: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base - role: admin-user diff --git a/chaos-at-home/ch-mimas2.yml b/chaos-at-home/ch-mimas2.yml index c458922b..90c15fd3 100644 --- a/chaos-at-home/ch-mimas2.yml +++ b/chaos-at-home/ch-mimas2.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: ch-mimas2 roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base - role: admin-user - role: bind - role: apt-repo/spreadspace diff --git a/chaos-at-home/common.yml b/chaos-at-home/common.yml index 22997e3f..7c1150b7 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: apt-repo/base - 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 ef53187f..fa4ffb77 100644 --- a/chaos-at-home/r3-cccamp19_vm.yml +++ b/chaos-at-home/r3-cccamp19_vm.yml @@ -2,6 +2,7 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh diff --git a/dan/common.yml b/dan/common.yml index 22997e3f..7c1150b7 100644 --- a/dan/common.yml +++ b/dan/common.yml @@ -2,7 +2,7 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: + - role: apt-repo/base - 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 62a26a01..4458fe57 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-dione.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-dione roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/dan/ele-gwhetzner.yml b/dan/ele-gwhetzner.yml index 22a7e447..26069582 100644 --- a/dan/ele-gwhetzner.yml +++ b/dan/ele-gwhetzner.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: ele-gwhetzner roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 6e5204dc..a363dc4c 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-helene roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/dan/ele-lt.yml b/dan/ele-lt.yml index 139f13da..b2776953 100644 --- a/dan/ele-lt.yml +++ b/dan/ele-lt.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: ele-lt roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 5e0cf970..3f3130fb 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-media roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: dyndns/client - role: apt-repo/spreadspace diff --git a/dan/ele-mur.yml b/dan/ele-mur.yml index da04fdb4..eb8a7b88 100644 --- a/dan/ele-mur.yml +++ b/dan/ele-mur.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: ele-mur roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 f3089925..b8e123ff 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-telesto.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-telesto roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index 6e5be4e1..5c83b9fb 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-thetys roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml index 71326514..870fc3ec 100644 --- a/dan/ele-uhrturm.yml +++ b/dan/ele-uhrturm.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: ele-uhrturm roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/dan/emc-master.yml b/dan/emc-master.yml index adf3ad98..eafb5697 100644 --- a/dan/emc-master.yml +++ b/dan/emc-master.yml @@ -2,8 +2,8 @@ - name: Basic Setup hosts: emc-master roles: + - role: apt-repo/base - 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 ccd7b962..3964cf9a 100644 --- a/dan/emc-xx.yml +++ b/dan/emc-xx.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 d7987021..7b4e9158 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -2,10 +2,10 @@ - name: Basic Node Setup hosts: k8s-emc roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 20d728c5..55648fd6 100644 --- a/dan/sk-2019.yml +++ b/dan/sk-2019.yml @@ -5,10 +5,11 @@ - debug: msg: "please use the branch topic/skillz-legacy for this host" #roles: + # - role: apt-repo/base # - role: core/base # - role: core/sshd # - role: core/zsh - # # - role: apt-repo/base ## TODO test this + # - role: core/cpu-microcode # - role: admin-user # - role: cryptdisk # - role: zfs/base diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml index ff8e0052..622556c4 100644 --- a/dan/sk-2019vm.yml +++ b/dan/sk-2019vm.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: sk-2019vm roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: cryptdisk - role: zfs/base diff --git a/dan/sk-cloudia.yml b/dan/sk-cloudia.yml index a8eebed1..c2df3615 100644 --- a/dan/sk-cloudia.yml +++ b/dan/sk-cloudia.yml @@ -5,10 +5,11 @@ - debug: msg: "please use the branch topic/skillz-legacy for this host" #roles: + # - role: apt-repo/base # - role: core/base # - role: core/sshd # - role: core/zsh - # - role: apt-repo/base + # - role: core/cpu-microcode # - role: admin-user # - role: zfs/base # - role: kubernetes/base diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml index 12bf01ba..ee96da7a 100644 --- a/dan/sk-tomnext-nc.yml +++ b/dan/sk-tomnext-nc.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: sk-tomnext-nc roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base - role: admin-user - role: zfs/base - role: apt-repo/spreadspace diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml index 3d2991a9..3e777bab 100644 --- a/dan/sk-tomnext.yml +++ b/dan/sk-tomnext.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: sk-tomnext roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: cryptdisk - role: zfs/base diff --git a/dan/sk-torrent.yml b/dan/sk-torrent.yml index ee80932b..918eec65 100644 --- a/dan/sk-torrent.yml +++ b/dan/sk-torrent.yml @@ -2,9 +2,9 @@ - name: Basic Setup hosts: sk-torrent roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base - role: admin-user - role: skillz/torrent diff --git a/roles/core/cpu-microcode/tasks/Debian.yml b/roles/core/cpu-microcode/tasks/Debian.yml new file mode 100644 index 00000000..9f6a27f4 --- /dev/null +++ b/roles/core/cpu-microcode/tasks/Debian.yml @@ -0,0 +1,16 @@ +--- +- name: check if non-free and contrib apt component is enabled for debian + when: 'ansible_distribution == "Debian"' + assert: + msg: "On Debian microcode-update packages are in non-free - please enable it (and contrib) using 'apt_repo_components'" + that: + - apt_repo_components is defined + - "'contrib' in apt_repo_components" + - "'non-free' in apt_repo_components" + +- name: install microcode-update packages + apt: + name: + - intel-microcode + - amd64-microcode + state: present diff --git a/roles/core/cpu-microcode/tasks/OpenBSD.yml b/roles/core/cpu-microcode/tasks/OpenBSD.yml new file mode 100644 index 00000000..7d6bbc08 --- /dev/null +++ b/roles/core/cpu-microcode/tasks/OpenBSD.yml @@ -0,0 +1,2 @@ +--- +## TODO: What do we need to do here? diff --git a/roles/core/cpu-microcode/tasks/main.yml b/roles/core/cpu-microcode/tasks/main.yml new file mode 100644 index 00000000..410a07cb --- /dev/null +++ b/roles/core/cpu-microcode/tasks/main.yml @@ -0,0 +1,12 @@ +--- +- name: load os/distrubtion/version specific tasks + vars: + params: + files: + - "{{ ansible_distribution_release }}.yml" + - "{{ ansible_distribution }}.yml" + - "{{ ansible_os_family }}.yml" + loop: "{{ q('first_found', params) }}" + loop_control: + loop_var: tasks_file + include_tasks: "{{ tasks_file }}" diff --git a/roles/installer/openbsd/base/defaults/main.yml b/roles/installer/openbsd/base/defaults/main.yml index bb2c177a..c852e00a 100644 --- a/roles/installer/openbsd/base/defaults/main.yml +++ b/roles/installer/openbsd/base/defaults/main.yml @@ -1,8 +1,8 @@ openbsd_versions: - - version: 6.6 + - version: 6.7 arch: - amd64 - i386 openbsd_installer_force_download: no -openbsd_installer_url: "https://ftp2.eu.openbsd.org/pub/OpenBSD" +openbsd_installer_url: "https://cdn.openbsd.org/pub/OpenBSD" diff --git a/spreadspace/common.yml b/spreadspace/common.yml index 22997e3f..7c1150b7 100644 --- a/spreadspace/common.yml +++ b/spreadspace/common.yml @@ -2,7 +2,7 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: + - role: apt-repo/base - 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 b928cbd5..17d21601 100644 --- a/spreadspace/k8s-lwl.yml +++ b/spreadspace/k8s-lwl.yml @@ -2,10 +2,10 @@ - name: Basic Node Setup hosts: k8s-lwl roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 ccd7b962..3964cf9a 100644 --- a/spreadspace/lendwirbel-live-xx.yml +++ b/spreadspace/lendwirbel-live-xx.yml @@ -2,10 +2,10 @@ - name: Basic Setup hosts: "{{ install_hostname }}" roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/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 145a3915..2a083fc0 100644 --- a/spreadspace/lw-dione.yml +++ b/spreadspace/lw-dione.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: lw-dione roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml index 757f9ff6..da4f42f5 100644 --- a/spreadspace/lw-helene.yml +++ b/spreadspace/lw-helene.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: lw-helene roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: chrony diff --git a/spreadspace/lw-master.yml b/spreadspace/lw-master.yml index 8490dfa0..99be1c2b 100644 --- a/spreadspace/lw-master.yml +++ b/spreadspace/lw-master.yml @@ -2,8 +2,8 @@ - name: Basic Setup hosts: lw-master roles: + - role: apt-repo/base - 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 53ad2a60..1cf4c5c5 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: lw-telesto roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index 84885b31..60159936 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: lw-thetys roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml index 5f39bcfa..a3a11652 100644 --- a/spreadspace/s2-calypso.yml +++ b/spreadspace/s2-calypso.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: s2-calypso roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml index 0ada118f..24673474 100644 --- a/spreadspace/s2-dione.yml +++ b/spreadspace/s2-dione.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: s2-dione roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml index c0bc1100..64fff1d3 100644 --- a/spreadspace/s2-helene.yml +++ b/spreadspace/s2-helene.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: s2-helene roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml index 6ac4787e..4642422a 100644 --- a/spreadspace/s2-telesto.yml +++ b/spreadspace/s2-telesto.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: s2-telesto roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 10da8f15..524e2894 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -2,10 +2,11 @@ - name: Basic Setup hosts: s2-thetys roles: + - role: apt-repo/base - role: core/base - role: core/sshd - role: core/zsh - - role: apt-repo/base + - role: core/cpu-microcode - role: admin-user - role: apt-repo/spreadspace - role: blackmagic-desktopvideo |