installer: move bootstrap roles to common subdir

26 files changed, 8 insertions, 537 deletions

diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml
index 21c52da1..a1cd0b0c 100644
--- a/chaos-at-home/ch-atlas.yml
+++ b/chaos-at-home/ch-atlas.yml
@@ -5,4 +5,4 @@
   - role: sshd
   - role: zsh
   - role: vm/host
-  - role: installer/debian
+  - role: installer/debian/base
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml
index 2ab51770..8a39ee19 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/chaos-at-home/ch-gnocchi.yml
@@ -6,8 +6,8 @@
   - role: sshd
   - role: zsh
   - role: vm/host
-  - role: installer/debian
-  - role: installer/openbsd
+  - role: installer/debian/base
+  - role: installer/openbsd/base
   post_tasks:
   # you need to reboot for changes to take effect
   - name: install network interface config
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index bb7b7d76..cca2da5f 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -9,7 +9,7 @@
   - role: cryptdisk
   - role: zfs/base
   - role: vm/host
-  - role: installer/debian
+  - role: installer/debian/base
   tasks:
   - name: install post-boot script
     copy:
diff --git a/preseed/.gitignore b/preseed/.gitignore
deleted file mode 100644
index 4f8f2ff1..00000000
--- a/preseed/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*-example.cfg
-vm-*.cfg
diff --git a/preseed/fetch-example.sh b/preseed/fetch-example.sh
deleted file mode 100755
index fa89bdba..00000000
--- a/preseed/fetch-example.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ] && [ -z "$2" ]; then
-  echo "Usage: $0 <distro> <codename>"
-  exit 1
-fi
-
-distro="$1"
-codename="$2"
-
-case "$distro" in
-  debian)
-     wget "https://www.debian.org/releases/$codename/example-preseed.txt" -O "$codename-example.cfg"
-     ;;
-  ubuntu)
-     rel="$codename"
-     case "$codename" in
-       xenial)
-         rel="16.04"
-         ;;
-       bionic)
-         rel="18.04"
-         ;;
-     esac
-     wget "https://help.ubuntu.com/$rel/installation-guide/example-preseed.txt" -O "$codename-example.cfg"
-     ;;
-esac
-
-exit 0
diff --git a/preseed/hosts/Readme.md b/preseed/hosts/Readme.md
deleted file mode 100644
index c6899a8d..00000000
--- a/preseed/hosts/Readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Preseed files for various hosts
-
-In order to fully automaticall install you need to start a temporay webserver using this directory as document root:
-
-    python -m SimpleHTTPServer 8000
-
-When this is done run the netinst image and intrd with the following boot command line:
-
-    auto=true interface=auto url=http://<ip of your machine>:8000/dione_debian-stretch.cfg netcfg/choose_interface=eno1 netcfg/get_hostname=dione netcfg/get_domain=spreadspace.org
-
-This example assumes you want to install the host `dione`.
-For debugging you may add the following to the kernel command line:
-
-    DEBCONF_DEBUG=5
-
diff --git a/preseed/hosts/calypso_debian-stretch.cfg b/preseed/hosts/calypso_debian-stretch.cfg
deleted file mode 100644
index bf5f2f61..00000000
--- a/preseed/hosts/calypso_debian-stretch.cfg
+++ /dev/null
@@ -1,129 +0,0 @@
-#########################################################################
-#  spreadspace preseed file for Debian stretch based VMs
-#########################################################################
-
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-
-# TODO: this does not work :(, probably adding it to the boot options will fix it
-d-i hw-detect/load_firmware boolean false
-
-d-i netcfg/choose_interface select eno1
-d-i netcfg/disable_autoconfig boolean true
-
-d-i netcfg/get_hostname string calypso
-d-i netcfg/get_domain string spreadspace.org
-d-i netcfg/wireless_wep string
-
-
-d-i mirror/country string manual
-d-i mirror/http/hostname string debian.ffgraz.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-d-i preseed/early_command string h=$(hostname -s); d=$(hostname -d); sed s/$h/calypso/g -i /etc/hosts /etc/hostname; sed s/$d/spreadspace.org/g -i /etc/hosts; hostname calypso
-
-d-i passwd/make-user boolean false
-d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
-d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
-
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/Vienna
-d-i clock-setup/ntp boolean false
-
-d-i partman-auto/disk string /dev/sda /dev/sdb
-d-i partman-auto/method string raid
-d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string calypso
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-md/confirm boolean true
-d-i partman-md/confirm_nooverwrite boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-d-i partman/choose_label string dos
-d-i partman/default_label string dos
-d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                       \
-      boot-root ::                                          \
-              256 512 256 raid                              \
-                      $lvmignore{ } $primary{ }             \
-                      method{ raid }                        \
-              .                                             \
-              1000 10000 -1 raid                            \
-                      $lvmignore{ } $primary{ }             \
-                      method{ raid }                        \
-              .                                             \
-              2560 10000 3072 ext4                          \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ calypso }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ / }                       \
-              .                                             \
-              1024 11000 1280 ext4                          \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ calypso }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var }                    \
-              .                                             \
-              768 10000 768 ext4                            \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ calypso }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var/log }                \
-                      options/nodev{ nodev }                \
-                      options/noatime{ noatime }            \
-                      options/noexec{ noexec }              \
-              .                                             \
-              16 20000 -1 ext4                              \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ calypso }                      \
-                      lv_name{ dummy }                      \
-              .
-
-d-i partman-auto-raid/recipe string \
-    1 2 0 ext4 /boot                \
-          /dev/sda1#/dev/sdb1       \
-    .                               \
-    1 2 0 lvm -                     \
-          /dev/sda2#/dev/sdb2       \
-    .
-
-d-i partman-basicfilesystems/no_swap true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string debian.ffgraz.net
-
-tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
-d-i pkgsel/upgrade select safe-upgrade
-popularity-contest popularity-contest/participate boolean false
-
-d-i grub-installer/choose_bootdev string /dev/sda /dev/sdb
-d-i grub-installer/bootdev string /dev/sda /dev/sdb
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
-d-i nobootloader/confirmation_common boolean true
-
-d-i finish-install/reboot_in_progress note
-
-
-d-i preseed/late_command string \
-    lvremove -f calypso/dummy; \
-    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
-    in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset consoleblank=0\"#' -i /etc/default/grub && update-grub"; \
-    in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys"
diff --git a/preseed/hosts/dione_debian-stretch.cfg b/preseed/hosts/dione_debian-stretch.cfg
deleted file mode 100644
index 8f989ff6..00000000
--- a/preseed/hosts/dione_debian-stretch.cfg
+++ /dev/null
@@ -1,114 +0,0 @@
-#########################################################################
-#  spreadspace preseed file for Debian stretch based VMs
-#########################################################################
-
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-
-
-d-i netcfg/choose_interface select eno1
-d-i netcfg/disable_autoconfig boolean true
-
-d-i netcfg/get_hostname string dione
-d-i netcfg/get_domain string spreadspace.org
-d-i netcfg/wireless_wep string
-
-
-d-i mirror/country string manual
-d-i mirror/http/hostname string debian.ffgraz.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-d-i preseed/early_command string h=$(hostname -s); d=$(hostname -d); sed s/$h/dione/g -i /etc/hosts /etc/hostname; sed s/$d/spreadspace.org/g -i /etc/hosts; hostname dione
-
-d-i passwd/make-user boolean false
-d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
-d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
-
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/Vienna
-d-i clock-setup/ntp boolean false
-
-d-i partman-efi/non_efi_system boolean true
-d-i partman-auto/disk string /dev/nvme0n1
-d-i partman-auto/method string lvm
-d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string dione
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-d-i partman/choose_label string gpt
-d-i partman/default_label string gpt
-d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                       \
-      boot-root ::                                          \
-              100 100 128 fat16                             \
-                      $defaultignore{ } $primary{ }         \
-                      $bootable{ } method{ efi } format{ }  \
-              .                                             \
-              1000 10000 -1 ext4                            \
-                      $defaultignore{ } $primary{ }         \
-                      method{ lvm } vg_name{ dione }        \
-              .                                             \
-              2560 10000 3072 ext4                          \
-                      $lvmok{ } in_vg{ dione }              \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ / }                       \
-              .                                             \
-              1024 11000 1280 ext4                          \
-                      $lvmok{ } in_vg{ dione }              \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var }                    \
-              .                                             \
-              768 10000 768 ext4                            \
-                      $lvmok{ } in_vg{ dione }              \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var/log }                \
-                      options/nodev{ nodev }                \
-                      options/noatime{ noatime }            \
-                      options/noexec{ noexec }              \
-              .                                             \
-              16 20000 -1 ext4                              \
-                      $lvmok{ } in_vg{ dione }              \
-                      method( keep } lv_name{ dummy }       \
-              .
-
-d-i partman-auto-lvm/no_boot boolean true
-d-i partman-basicfilesystems/no_swap true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string debian.ffgraz.net
-
-tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
-d-i pkgsel/upgrade select safe-upgrade
-popularity-contest popularity-contest/participate boolean false
-
-d-i grub-installer/choose_bootdev string /dev/nvme0n1
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
-d-i nobootloader/confirmation_common boolean true
-
-d-i finish-install/reboot_in_progress note
-
-
-d-i preseed/late_command string \
-    lvremove -f dione/dummy; \
-    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
-    in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset consoleblank=0\"#' -i /etc/default/grub && update-grub"; \
-    in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys"
diff --git a/preseed/hosts/helene_debian-stretch.cfg b/preseed/hosts/helene_debian-stretch.cfg
deleted file mode 100644
index b89e7326..00000000
--- a/preseed/hosts/helene_debian-stretch.cfg
+++ /dev/null
@@ -1,114 +0,0 @@
-#########################################################################
-#  spreadspace preseed file for Debian stretch based VMs
-#########################################################################
-
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-
-
-d-i netcfg/choose_interface select eno1
-d-i netcfg/disable_autoconfig boolean true
-
-d-i netcfg/get_hostname string helene
-d-i netcfg/get_domain string spreadspace.org
-d-i netcfg/wireless_wep string
-
-
-d-i mirror/country string manual
-d-i mirror/http/hostname string debian.ffgraz.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-d-i preseed/early_command string h=$(hostname -s); d=$(hostname -d); sed s/$h/helene/g -i /etc/hosts /etc/hostname; sed s/$d/spreadspace.org/g -i /etc/hosts; hostname helene
-
-d-i passwd/make-user boolean false
-d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
-d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
-
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/Vienna
-d-i clock-setup/ntp boolean false
-
-d-i partman-efi/non_efi_system boolean true
-d-i partman-auto/disk string /dev/nvme0n1
-d-i partman-auto/method string lvm
-d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string helene
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-d-i partman/choose_label string gpt
-d-i partman/default_label string gpt
-d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                       \
-      boot-root ::                                          \
-              100 100 128 fat16                             \
-                      $defaultignore{ } $primary{ }         \
-                      $bootable{ } method{ efi } format{ }  \
-              .                                             \
-              1000 10000 -1 ext4                            \
-                      $defaultignore{ } $primary{ }         \
-                      method{ lvm } vg_name{ helene }       \
-              .                                             \
-              2560 10000 3072 ext4                          \
-                      $lvmok{ } in_vg{ helene }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ / }                       \
-              .                                             \
-              1024 11000 1280 ext4                          \
-                      $lvmok{ } in_vg{ helene }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var }                    \
-              .                                             \
-              768 10000 768 ext4                            \
-                      $lvmok{ } in_vg{ helene }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var/log }                \
-                      options/nodev{ nodev }                \
-                      options/noatime{ noatime }            \
-                      options/noexec{ noexec }              \
-              .                                             \
-              16 20000 -1 ext4                              \
-                      $lvmok{ } in_vg{ helene }             \
-                      method( keep } lv_name{ dummy }       \
-              .
-
-d-i partman-auto-lvm/no_boot boolean true
-d-i partman-basicfilesystems/no_swap true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string debian.ffgraz.net
-
-tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
-d-i pkgsel/upgrade select safe-upgrade
-popularity-contest popularity-contest/participate boolean false
-
-d-i grub-installer/choose_bootdev string /dev/nvme0n1
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
-d-i nobootloader/confirmation_common boolean true
-
-d-i finish-install/reboot_in_progress note
-
-
-d-i preseed/late_command string \
-    lvremove -f helene/dummy; \
-    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
-    in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset consoleblank=0\"#' -i /etc/default/grub && update-grub"; \
-    in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys"
diff --git a/preseed/hosts/telesto_debian-stretch.cfg b/preseed/hosts/telesto_debian-stretch.cfg
deleted file mode 100644
index 5bbd382b..00000000
--- a/preseed/hosts/telesto_debian-stretch.cfg
+++ /dev/null
@@ -1,126 +0,0 @@
-#########################################################################
-#  spreadspace preseed file for Debian stretch based VMs
-#########################################################################
-
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-
-d-i netcfg/choose_interface select eno1
-d-i netcfg/disable_autoconfig boolean true
-
-d-i netcfg/get_hostname string telesto
-d-i netcfg/get_domain string spreadspace.org
-d-i netcfg/wireless_wep string
-
-
-d-i mirror/country string manual
-d-i mirror/http/hostname string debian.ffgraz.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-d-i preseed/early_command string h=$(hostname -s); d=$(hostname -d); sed s/$h/telesto/g -i /etc/hosts /etc/hostname; sed s/$d/spreadspace.org/g -i /etc/hosts; hostname telesto
-
-d-i passwd/make-user boolean false
-d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
-d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
-
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/Vienna
-d-i clock-setup/ntp boolean false
-
-d-i partman-auto/disk string /dev/sda /dev/sdb
-d-i partman-auto/method string raid
-d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string telesto
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-md/confirm boolean true
-d-i partman-md/confirm_nooverwrite boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-d-i partman/choose_label string dos
-d-i partman/default_label string dos
-d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                       \
-      boot-root ::                                          \
-              256 512 256 raid                              \
-                      $lvmignore{ } $primary{ }             \
-                      method{ raid }                        \
-              .                                             \
-              1000 10000 -1 raid                            \
-                      $lvmignore{ } $primary{ }             \
-                      method{ raid }                        \
-              .                                             \
-              2560 10000 3072 ext4                          \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ telesto }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ / }                       \
-              .                                             \
-              1024 11000 1280 ext4                          \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ telesto }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var }                    \
-              .                                             \
-              768 10000 768 ext4                            \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ telesto }                      \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var/log }                \
-                      options/nodev{ nodev }                \
-                      options/noatime{ noatime }            \
-                      options/noexec{ noexec }              \
-              .                                             \
-              16 20000 -1 ext4                              \
-                      $defaultignore{ } $lvmok{ }           \
-                      in_vg{ telesto }                      \
-                      lv_name{ dummy }                      \
-              .
-
-d-i partman-auto-raid/recipe string \
-    1 2 0 ext4 /boot                \
-          /dev/sda1#/dev/sdb1       \
-    .                               \
-    1 2 0 lvm -                     \
-          /dev/sda2#/dev/sdb2       \
-    .
-
-d-i partman-basicfilesystems/no_swap true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string debian.ffgraz.net
-
-tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
-d-i pkgsel/upgrade select safe-upgrade
-popularity-contest popularity-contest/participate boolean false
-
-d-i grub-installer/choose_bootdev string /dev/sda /dev/sdb
-d-i grub-installer/bootdev string /dev/sda /dev/sdb
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
-d-i nobootloader/confirmation_common boolean true
-
-d-i finish-install/reboot_in_progress note
-
-
-d-i preseed/late_command string \
-    lvremove -f telesto/dummy; \
-    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
-    in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset consoleblank=0\"#' -i /etc/default/grub && update-grub"; \
-    in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys"
diff --git a/roles/installer/debian/defaults/main.yml b/roles/installer/debian/base/defaults/main.yml
index 8962e9ad..8962e9ad 100644
--- a/roles/installer/debian/defaults/main.yml
+++ b/roles/installer/debian/base/defaults/main.yml
diff --git a/roles/installer/debian/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml
index 92fac536..92fac536 100644
--- a/roles/installer/debian/tasks/main.yml
+++ b/roles/installer/debian/base/tasks/main.yml
diff --git a/roles/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml
index c5400493..c5400493 100644
--- a/roles/preseed/defaults/main.yml
+++ b/roles/installer/debian/preseed/defaults/main.yml
diff --git a/roles/preseed/tasks/main.yml b/roles/installer/debian/preseed/tasks/main.yml
index b1b5d275..b1b5d275 100644
--- a/roles/preseed/tasks/main.yml
+++ b/roles/installer/debian/preseed/tasks/main.yml
diff --git a/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
index 9952fa0a..9952fa0a 100644
--- a/roles/preseed/templates/preseed_debian-buster.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
diff --git a/roles/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
index 4519d910..4519d910 100644
--- a/roles/preseed/templates/preseed_debian-jessie.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
index 8969fa7c..8969fa7c 100644
--- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index a2fffd11..a2fffd11 100644
--- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 0b3d3698..0b3d3698 100644
--- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
diff --git a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2
index 22f47ce7..22f47ce7 100644
--- a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2
diff --git a/roles/installer/openbsd/defaults/main.yml b/roles/installer/openbsd/base/defaults/main.yml
index 6650e064..6650e064 100644
--- a/roles/installer/openbsd/defaults/main.yml
+++ b/roles/installer/openbsd/base/defaults/main.yml
diff --git a/roles/installer/openbsd/tasks/main.yml b/roles/installer/openbsd/base/tasks/main.yml
index fcc79589..fcc79589 100644
--- a/roles/installer/openbsd/tasks/main.yml
+++ b/roles/installer/openbsd/base/tasks/main.yml
diff --git a/roles/usb-install/meta/main.yml b/roles/usb-install/meta/main.yml
index 0fc96588..9db4a441 100644
--- a/roles/usb-install/meta/main.yml
+++ b/roles/usb-install/meta/main.yml
@@ -1,5 +1,5 @@
 dependencies:
-  - role: installer/debian
+  - role: installer/debian/base
     distros:
       - distro: "{{ install_distro }}"
         codename: "{{ install_codename }}"
diff --git a/roles/usb-install/tasks/main.yml b/roles/usb-install/tasks/main.yml
index fab32b02..3153b633 100644
--- a/roles/usb-install/tasks/main.yml
+++ b/roles/usb-install/tasks/main.yml
@@ -6,7 +6,7 @@
       register: tmpdir
 
     - import_role:
-        name: preseed
+        name: installer/debian/preseed
       vars:
         preseed_tmpdir: "{{ tmpdir.path }}"
 
diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml
index 347e30c4..34c068b6 100644
--- a/roles/vm/install/meta/main.yml
+++ b/roles/vm/install/meta/main.yml
@@ -1,6 +1,6 @@
 ---
 # dependencies:
-#   - role: installer/debian
+#   - role: installer/debian/base
 #     distros:
 #       - distro: "{{ install_distro }}"
 #         codename: "{{ install_codename }}"
diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml
index 10b10e18..9d5ea6a2 100644
--- a/roles/vm/install/tasks/main.yml
+++ b/roles/vm/install/tasks/main.yml
@@ -29,7 +29,7 @@
       register: tmpdir
 
     # - import_role:
-    #     name: preseed
+    #     name: installer/debian/preseed
     #   vars:
     #     ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}"
     #     preseed_tmpdir: "{{ tmpdir.path }}"