diff options
40 files changed, 394 insertions, 203 deletions
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index 981e65fb..f7c77328 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -13,4 +13,4 @@ - role: apt-repo/tor-project - role: apt-repo/kubernetes - role: apt-repo/riot - - role: ubuntu-ws + - role: ws/base diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml new file mode 100644 index 00000000..a78517ce --- /dev/null +++ b/chaos-at-home/ch-telesto.yml @@ -0,0 +1,14 @@ +--- +- name: Basic Setup + hosts: ch-telesto + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd + - role: core/zsh + - role: core/cpu-microcode + - role: zfs/base + - role: ws/base + - role: core/admin-users + - role: apt-repo/spreadspace + - role: streaming/blackmagic/desktopvideo diff --git a/chaos-at-home/group_vars/chaos-at-home.yml b/chaos-at-home/group_vars/chaos-at-home.yml index f7da7437..8cc9a860 100644 --- a/chaos-at-home/group_vars/chaos-at-home.yml +++ b/chaos-at-home/group_vars/chaos-at-home.yml @@ -1,24 +1,27 @@ $ANSIBLE_VAULT;1.2;AES256;chaos-at-home -66636539316637643337323635383630306330396536346236333839653364343866633434376437 -3564646633666539396238383762656433633165386661620a353730316633323237653539313263 -31633563343634356261653231336465343666303537323830333662363330343032623634646131 -3065356635643364610a333366326563623633336463626330316637663432303765626633653738 -32386131613737653332643836636237663739626566386432616262363031646236366161303138 -31343730393662646333376631343539306136323432393639396433643665333531333963346264 -33393563383136396636303366353037386461376135353332353534306131326666333565356335 -38363938396635666630316630333266353238343834303338363637393661353263306531373535 -30336561663961313736636631653033303966376231353430323965376234643337626536383435 -36316430636130636433303736633665333938343731653130663562316464353764323736653533 -38616535313137383162343130366235613539623933393830323366376663313932303932376335 -61326334303733646539356334336437626363333865623963316361303330356535303733393034 -30653538373161626362643362313061633565393663323864653436666464353464353765613735 -62623635323164383537616161643566333539623732376130336266363631323733383434316666 -63303561386434633833396432653932353739383836646434393832363936336538383661313266 -34633432323366633664646335373362313831643834306265333163316462316233363335333938 -63383037376563343566663130353731333561343131353362393937326161396232663566366638 -61643263663865353364313431336439326139303233646665356435616638656466353064383632 -33626538646166326639383064353736623666653339623865643237396563336361353263616466 -66346563313737313037653735363666643662356239353163336337393565643165633732663839 -30616166346637623030646262386435613066636132646665623764643661653730343730346331 -62666638313737346332336236653864633931356231613037373638656562396438323533323062 -393534663638616536653534663333613639 +37363633653262356539353263326436303965373365613031326238343332623531633734626466 +6431623733383832306662613039373138346666336663640a303764313730626231383965663130 +37386565653733303737343433626332373639353663616235346131313339396263386133326361 +6565353432386538320a623337346334663139323533613333363665656162346138313236393637 +36623439626632396531353631613037313166666136373934623739333237623661396332376436 +31373461653564386266336639633861613536663831633162323863373630393834663531306531 +32343932303561333363373561353035346562383833336663383135626631663133346663333635 +62333661386237613035313235303132396431643732383732386336636165393838393464323033 +34343963646534306433303163616132653164666163336137353034336164383661616263613965 +62633937656538323461306361626235613338653266386134363363356163366161366166346362 +35366531376664613237376133396164373762383735373236343166383534636636643733393838 +37616361316363373262336530336564653335383630633736383239353635616432386635306134 +38663464653535613738666631303337326334346635393363363837623734316233396166303232 +34343561313736353765633064656665333934316631613233353163393837646465303830613231 +62363033363066336438306636636330646530663330356638343930646430323838666533666337 +31363038356435346239613930323161643065663063613665333566623634653333396561376365 +35336437643339303465323361326561646436366437636165356563653636333766343038303134 +61343239333536623331306561646336636335323432643434333561386664373861303732393665 +32393332336135633135643938613330666236323631613634353533656462383966333761343461 +34353838356561636161383565333039613136333431623936316136396630363662313234613735 +39383765643961316164633333323237343063653565353461626461333737313363326436376461 +61656465373035316466653733613931666139643336363866636136333039643536333336653630 +35383463623334616162306639303132633637373031383638666331653333656132313934366131 +61343337626561333537613534396333636139356264313731636462363362336231663363613862 +63653365393139383234306362306430373636636262313662663531633537356536303931373963 +3565613330363934636135636531633932653537656563336336 diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml index 0e0470b2..11f21ef0 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-telesto.yml @@ -10,4 +10,4 @@ - role: core/admin-users - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - - role: ubuntu-ws + - role: ws/base diff --git a/inventory/group_vars/all/vars.yml b/inventory/group_vars/all/vars.yml index 540c4a3e..b92ca4d5 100644 --- a/inventory/group_vars/all/vars.yml +++ b/inventory/group_vars/all/vars.yml @@ -60,3 +60,16 @@ apt_repo_providers: ubuntu: host: debian.ffgraz.net path: /ubuntu + inode: + debian: + host: debian.inode.at + path: /debian + debian_security: + host: security.debian.org + path: /debian-security + debian_archive: + host: archive.debian.org + path: /debian + ubuntu: + host: ubuntu.inode.at + path: /ubuntu diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 67950f94..ea7b4958 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -13,6 +13,11 @@ network_zones: offsets: ch-equinox-ws: 1 ch-mc: 10 + ch-telesto: 20 + ch-calypso: 21 + ch-thetys: 22 + ch-dione: 23 + ch-helene: 24 ch-prometheus: 200 ch-gw-lan: 254 ############# diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml index b0322c81..c09c75e1 100644 --- a/inventory/group_vars/chaos-at-home/vars.yml +++ b/inventory/group_vars/chaos-at-home/vars.yml @@ -5,3 +5,9 @@ admin_users_group: - equinox acmetool_account_email: admin@chaos-at-home.org + +apt_repo_provider: inode + +apt_repo_blackmagic_auth: + username: "chaos-at-home" + password: "{{ vault_apt_repo_blackmagic_auth.password }}" diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml new file mode 100644 index 00000000..d565c6d8 --- /dev/null +++ b/inventory/host_vars/ch-calypso.yml @@ -0,0 +1,22 @@ +--- +install: + efi: yes + disks: + primary: software-raid + raid: + level: 1 + members: + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805 + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811 + system_lvm: + size: 20G + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml new file mode 100644 index 00000000..40c2864b --- /dev/null +++ b/inventory/host_vars/ch-dione.yml @@ -0,0 +1,22 @@ +--- +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 + kernel_cmdline: + - "consoleblank=0" + - "nomodeset" + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + + +admin_users_host: + - equinox diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index e31b8299..a1130257 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -1,8 +1,18 @@ --- -preseed_template_name: "xubuntu-focal-desktop" +preseed_language: de +preseed_country: AT +preseed_locales: + - de_AT.UTF-8 + - de_DE.UTF-8 + - en_US.UTF-8 + +preseed_no_splash: no +preseed_install_tasks: + - xubuntu-desktop + install: - efi: true + efi: yes disks: primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K system_lvm: @@ -46,7 +56,7 @@ apt_repo_components: - universe - multiverse -ubuntu_ws_extra_packages: +ws_base_extra_packages: - aisleriot - atftp - asciidoc diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml new file mode 100644 index 00000000..f35225ac --- /dev/null +++ b/inventory/host_vars/ch-helene.yml @@ -0,0 +1,22 @@ +--- +install: + efi: true + disks: + primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 + kernel_cmdline: + - "consoleblank=0" + - "nomodeset" + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + + +admin_users_host: + - equinox diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml new file mode 100644 index 00000000..a2d94e16 --- /dev/null +++ b/inventory/host_vars/ch-telesto.yml @@ -0,0 +1,79 @@ +--- +preseed_language: de +preseed_country: AT +preseed_locales: + - de_AT.UTF-8 + - de_DE.UTF-8 + - en_US.UTF-8 + +preseed_no_splash: no +preseed_install_tasks: + - xubuntu-desktop + + +install: + efi: yes + disks: + primary: software-raid + raid: + level: 1 + members: + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 + system_lvm: + size: 50G + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + + +apt_repo_components: + - main + - restricted + - universe + - multiverse + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + +admin_users_host: + - equinox + +zfs_arc_size: + min: 1GB + max: 2GB + +zfs_pools: + storage: + mountpoint: /srv/storage + create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808-part4 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810-part4 + +ws_base_home_zfs: + pool: storage + name: home + properties: + xattr: sa + compression: lz4 + quota: 100G + +ws_base_extra_packages: + - obs-studio diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml new file mode 100644 index 00000000..1c82ae9b --- /dev/null +++ b/inventory/host_vars/ch-thetys.yml @@ -0,0 +1,21 @@ +--- +install: + efi: true + disks: + primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161" + kernel_cmdline: + - "consoleblank=0" + +network: + nameservers: "{{ network_zones.lan.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + gateway: "{{ network_zones.lan.gateway }}" + interfaces: + - *_network_primary_ + + +admin_users_host: + - equinox diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml index ab8fca7c..d565c6d8 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -1,12 +1,15 @@ --- install: + efi: yes disks: primary: software-raid raid: level: 1 members: - - /dev/sda - - /dev/sdb + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805 + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811 + system_lvm: + size: 20G network: nameservers: "{{ network_zones.lan.dns }}" diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 233fc9e8..1152e5cf 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -9,7 +9,7 @@ install: network: nameservers: "{{ network_zones.lan.dns }}" - domain: spreadspace.org + domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" @@ -17,6 +17,7 @@ network: interfaces: - *_network_primary_ + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index a28eccf2..a5418e56 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -9,7 +9,7 @@ install: network: nameservers: "{{ network_zones.lan.dns }}" - domain: spreadspace.org + domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" @@ -17,6 +17,7 @@ network: interfaces: - *_network_primary_ + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml index 8fe1376d..6e642dee 100644 --- a/inventory/host_vars/ele-telesto.yml +++ b/inventory/host_vars/ele-telesto.yml @@ -1,17 +1,27 @@ --- -base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" +preseed_language: de +preseed_country: AT +preseed_locales: + - de_AT.UTF-8 + - de_DE.UTF-8 + - en_US.UTF-8 + +preseed_no_splash: no +preseed_install_tasks: + - xubuntu-desktop -preseed_template_name: "xubuntu-focal-desktop" install: + efi: yes disks: primary: software-raid raid: level: 1 members: - - /dev/sda - - /dev/sdb + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 system_lvm: + size: 50G volumes: - name: root size: 20G @@ -36,5 +46,8 @@ network: interfaces: - *_network_primary_ + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + admin_users_host: - equinox diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 69bdec2b..c193de2e 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -16,6 +16,7 @@ network: interfaces: - *_network_primary_ + admin_users_host: - equinox diff --git a/inventory/host_vars/lw-dione.yml b/inventory/host_vars/lw-dione.yml index 02738ee6..9b05f037 100644 --- a/inventory/host_vars/lw-dione.yml +++ b/inventory/host_vars/lw-dione.yml @@ -18,6 +18,7 @@ network: interfaces: - *_network_primary_ + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/lw-helene.yml b/inventory/host_vars/lw-helene.yml index e7919ac7..6b68549b 100644 --- a/inventory/host_vars/lw-helene.yml +++ b/inventory/host_vars/lw-helene.yml @@ -18,6 +18,7 @@ network: interfaces: - *_network_primary_ + base_packages_extra_host: - exfat-fuse - exfat-utils diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml index a225d787..ce9847a9 100644 --- a/inventory/host_vars/lw-telesto.yml +++ b/inventory/host_vars/lw-telesto.yml @@ -1,17 +1,27 @@ --- -base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" +preseed_language: de +preseed_country: AT +preseed_locales: + - de_AT.UTF-8 + - de_DE.UTF-8 + - en_US.UTF-8 + +preseed_no_splash: no +preseed_install_tasks: + - xubuntu-desktop -preseed_template_name: "xubuntu-focal-desktop" install: + efi: yes disks: primary: software-raid raid: level: 1 members: - - /dev/sda - - /dev/sdb + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 + - /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 system_lvm: + size: 50G volumes: - name: root size: 20G @@ -37,5 +47,8 @@ network: interfaces: - *_network_primary_ + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + admin_users_host: - equinox diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml index 77aee114..326c55d7 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -17,6 +17,7 @@ network: interfaces: - *_network_primary_ + admin_users_host: - equinox diff --git a/inventory/hosts.ini b/inventory/hosts.ini index fb5672ee..352dd875 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -33,6 +33,12 @@ ch-testvm host_name=testvm ch-mimas host_name=mimas ch-mimas2 host_name=mimas +ch-telesto host_name=telesto +ch-calypso host_name=calypso +ch-thetys host_name=thetys +ch-dione host_name=dione +ch-helene host_name=helene + [chaos-at-home:children] mz-chaos-at-home chaos-at-home-switches diff --git a/roles/installer/debian/iso/templates/isolinux.cfg.j2 b/roles/installer/debian/iso/templates/isolinux.cfg.j2 index c7bf1246..0a6555c2 100644 --- a/roles/installer/debian/iso/templates/isolinux.cfg.j2 +++ b/roles/installer/debian/iso/templates/isolinux.cfg.j2 @@ -12,4 +12,4 @@ SAY ** LABEL {{ install_hostname }} KERNEL linux INITRD initrd.gz - APPEND auto=true fb=false {{ (hostvars[install_hostname].install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND auto fb=false {{ (hostvars[install_hostname].install_cooked.kernel_cmdline | default([])) | join(' ') }} diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index 2ad4e32a..5b7bea07 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -2,6 +2,16 @@ # preseed_initrd # preseed_tmpdir: +preseed_language: en +preseed_country: US +preseed_locales: + - en_US.UTF-8 + +preseed_keyboard_layout: de +preseed_keyboard_variant: nodeadkeys + +preseed_timezone: Europe/Vienna + # preseed_force_net_ifnames_policy: path preseed_no_netplan: no diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 index d02ab496..04ccfcb4 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian bullseye based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index fa70d2b9..77671947 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian buster based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index d033b3b0..02379c16 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian jessie based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 index 0528f33c..01108f09 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -2,10 +2,15 @@ # spreadspace preseed file for Debian stretch based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select us +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} + +d-i keyboard-configuration/xkb-keymap select {{ preseed_keyboard_layout }} +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -42,7 +47,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index 61f08552..503d09c4 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu bionic based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -50,7 +52,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 76f6a045..64fad668 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu focal based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -50,7 +52,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 28d68250..fbebcddf 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -2,14 +2,16 @@ # spreadspace preseed file for Ubuntu xenial based machines ######################################################################### -d-i debian-installer/language string en -d-i debian-installer/country string AT -d-i debian-installer/locale string en_US.UTF-8 -d-i localechooser/preferred-locale string en_US.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, de_AT.UTF-8 +d-i debian-installer/language string {{ preseed_language }} +d-i debian-installer/country string {{ preseed_country }} +d-i debian-installer/locale string {{ preseed_locales | first }} +d-i localechooser/preferred-locale string {{ preseed_locales | first }} +d-i localechooser/supported-locales multiselect {{ preseed_locales | join(', ') }} +d-i localechooser/translation/warn-light boolean true + d-i console-setup/ask_detect boolean false -d-i keyboard-configuration/xkb-keymap select us -d-i keyboard-configuration/layoutcode string us +d-i keyboard-configuration/layoutcode string {{ preseed_keyboard_layout }} +d-i keyboard-configuration/variantcode string {{ preseed_keyboard_variant }} d-i hw-detect/load_firmware boolean false @@ -47,7 +49,7 @@ d-i passwd/root-password-again password this-very-very-secure-password-will-be-r d-i clock-setup/utc boolean true -d-i time/zone string Europe/Vienna +d-i time/zone string {{ preseed_timezone }} d-i clock-setup/ntp boolean false diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 deleted file mode 100644 index ee4eb717..00000000 --- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 +++ /dev/null @@ -1,112 +0,0 @@ -######################################################################### -# spreadspace preseed file for Ubuntu focal based workstations -######################################################################### - -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 localechooser/preferred-locale string de_AT.UTF-8 -d-i localechooser/supported-locales multiselect de_DE.UTF-8, en_US.UTF-8 -d-i keyboard-configuration/xkb-keymap select de -## TODO: this still doesn't work properly... -d-i keyboard-configuration/layout select German (Austria) -d-i keyboard-configuration/layoutcode string at -d-i keyboard-configuration/layoutcode string nodeadkeys -d-i console-setup/ask_detect boolean false - -d-i hw-detect/load_firmware boolean false - -{% if preseed_no_netplan %} -d-i netcfg/do_not_use_netplan boolean true -{% endif %} -d-i netcfg/choose_interface select {{ install_interface | default(hostvars[install_hostname].network_cooked.primary.name) }} -{% if 'install_dhcp' in hostvars[install_hostname] and hostvars[install_hostname].install_dhcp %} -d-i netcfg/disable_dhcp boolean false -d-i netcfg/disable_autoconfig boolean false -{% else %} -d-i netcfg/disable_dhcp boolean true -d-i netcfg/disable_autoconfig boolean true -d-i netcfg/get_ipaddress string {{ hostvars[install_hostname].network_cooked.primary.address | ipaddr('address') }} -d-i netcfg/get_netmask string {{ hostvars[install_hostname].network_cooked.primary.address | ipaddr('netmask') }} -d-i netcfg/get_gateway string {{ hostvars[install_hostname].network_cooked.primary.gateway }} -d-i netcfg/get_nameservers string {{ hostvars[install_hostname].network_cooked.nameservers | join(' ') }} -d-i netcfg/confirm_static boolean true -{% endif %} - -d-i netcfg/hostname string {{ hostvars[install_hostname].host_name }} -d-i netcfg/get_hostname string {{ hostvars[install_hostname].host_name }} -d-i netcfg/domain string {{ hostvars[install_hostname].network_cooked.domain }} -d-i netcfg/get_domain string {{ hostvars[install_hostname].network_cooked.domain }} -d-i netcfg/wireless_wep string - - -d-i mirror/country string manual -d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }} -d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} -d-i mirror/http/proxy string - - -d-i passwd/make-user boolean false -d-i passwd/root-login boolean true -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 - - -{% include 'partman_config.j2' %} - - -{% if preseed_kernel_image is defined %} -d-i base-installer/kernel/image string {{ preseed_kernel_image }} -{% elif preseed_virtual_machine %} -d-i base-installer/kernel/image string linux-virtual -{% endif %} -{% if preseed_no_splash %} -d-i debian-installer/splash boolean false -d-i debian-installer/add-kernel-opts string nosplash -{% endif %} - -d-i base-installer/install-recommends boolean false -d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }} -d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }} -{% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %} -d-i apt-setup/multiarch string amd64 -{% endif %} - -tasksel tasksel/first multiselect {{ preseed_install_tasks | join(', ') }} -d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt{% if preseed_no_netplan %} ifupdown{% endif %}{{ '' }} -d-i pkgsel/upgrade select safe-upgrade -popularity-contest popularity-contest/participate boolean false -d-i pkgsel/update-policy select none - -d-i finish-install/reboot_in_progress note - - -d-i preseed/late_command string \ - lvremove -f {{ hostvars[install_hostname].host_name }}/dummy; \ - in-target bash -c "swapoff -a; sed -e '/^\/swapfile/d' -i /etc/fstab; rm -f /swapfile"; \ - in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \ - in-target bash -c "env SUDO_FORCE_REMOVE=yes apt-get purge -y -q ubuntu-minimal sudo ubuntu-advantage-tools"; \ -{% if preseed_no_netplan %} - in-target bash -c "apt-get purge -y -q netplan.io && apt-get autoremove -y -q && rm -rf /etc/netplan"; \ -{% endif %} - in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \ -{% if preseed_force_net_ifnames_policy is defined %} - mkdir -p /target/etc/systemd/network; \ - in-target bash -c "echo '[Match]' > /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo 'OriginalName=*' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo '' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo '[Link]' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "echo 'NamePolicy={{ preseed_force_net_ifnames_policy }}' >> /etc/systemd/network/90-namepolicy.link"; \ - in-target bash -c "update-initramfs -u"; \ -{% endif %} - in-target bash -c "passwd -d root && passwd -l root"; \ -{% if hostvars[install_hostname].ansible_port is defined %} - in-target bash -c "sed -e 's/^\(\s*#*\s*Port.*\)/Port {{ hostvars[install_hostname].ansible_port }}/' -i /etc/ssh/sshd_config"; \ -{% endif %} - mkdir -p -m 0700 /target/root/.ssh; \ - cp /authorized_keys /target/root/.ssh/ diff --git a/roles/installer/debian/usb/templates/syslinux.cfg.j2 b/roles/installer/debian/usb/templates/syslinux.cfg.j2 index c6acadd3..4531c1f9 100644 --- a/roles/installer/debian/usb/templates/syslinux.cfg.j2 +++ b/roles/installer/debian/usb/templates/syslinux.cfg.j2 @@ -21,5 +21,5 @@ LABEL {{ host }} MENU LABEL automatic installer for {{ host }} KERNEL {{ syslinux_base_path }}linux INITRD {{ syslinux_base_path }}initrd.{{ host }}.gz - APPEND auto=true fb=false {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} + APPEND auto fb=false {{ (hostvars[host].install_cooked.kernel_cmdline | default([])) | join(' ') }} {% endfor %} diff --git a/roles/ubuntu-ws/defaults/main.yml b/roles/ubuntu-ws/defaults/main.yml deleted file mode 100644 index 9db0c3dc..00000000 --- a/roles/ubuntu-ws/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -ubuntu_ws_extra_packages: [] diff --git a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 index daf6026c..05ad6750 100644 --- a/roles/vm/guest/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/guest/define/templates/libvirt-domain.xml.j2 @@ -9,7 +9,7 @@ {% if install_distro == 'debian' or install_distro == 'ubuntu' %} <kernel>{{ installer_tmpdir }}/linux</kernel> <initrd>{{ installer_tmpdir }}/initrd.gz</initrd> - <cmdline>console=ttyS0,115200n8 auto=true</cmdline> + <cmdline>console=ttyS0,115200n8 auto</cmdline> <boot dev='hd'/> {% elif install_distro == 'openbsd' %} <boot dev='cdrom'/> diff --git a/roles/ws/base/defaults/main.yml b/roles/ws/base/defaults/main.yml new file mode 100644 index 00000000..eb094e0b --- /dev/null +++ b/roles/ws/base/defaults/main.yml @@ -0,0 +1,4 @@ +--- +ws_base_extra_packages: [] + +# ws_base_home_zfs: {} diff --git a/roles/ubuntu-ws/tasks/main.yml b/roles/ws/base/tasks/main.yml index 9e3b55b8..75a753d8 100644 --- a/roles/ubuntu-ws/tasks/main.yml +++ b/roles/ws/base/tasks/main.yml @@ -1,4 +1,11 @@ --- +- name: create zfs dataset for /home + when: ws_base_home_zfs is defined + zfs: + name: "{{ ws_base_home_zfs.pool }}/{{ ws_base_home_zfs.name }}" + state: present + extra_zfs_properties: "{{ ws_base_home_zfs.properties | default({}) | combine({'mountpoint': '/home'}) }}" + - name: prohibited packages loop: - flashplugin-installer @@ -78,5 +85,5 @@ - name: install extra packages apt: - name: "{{ ubuntu_ws_extra_packages }}" + name: "{{ ws_base_extra_packages }}" state: present diff --git a/roles/ubuntu-ws/templates/prohibited-package.j2 b/roles/ws/base/templates/prohibited-package.j2 index c5ef1062..c5ef1062 100644 --- a/roles/ubuntu-ws/templates/prohibited-package.j2 +++ b/roles/ws/base/templates/prohibited-package.j2 diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index 2f2794ad..61f33fe6 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -10,5 +10,5 @@ - role: core/admin-users - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - - role: ubuntu-ws + - role: ws/base - role: wireguard/base |