summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dan/ele-telesto.yml4
-rw-r--r--inventory/host_vars/ele-telesto.yml43
2 files changed, 5 insertions, 42 deletions
diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml
index 94adf08d..ffc945c3 100644
--- a/dan/ele-telesto.yml
+++ b/dan/ele-telesto.yml
@@ -7,7 +7,3 @@
- role: core/sshd/base
- role: core/zsh
- role: core/cpu-microcode
- - role: core/admin-users
- - role: streaming/blackmagic/desktopvideo
- - role: apt-repo/spreadspace
- - role: ws/base
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 5aa6c608..a6790797 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,40 +1,8 @@
---
-debian_preseed_language: de
-debian_preseed_country: AT
-debian_preseed_locales:
- - de_AT.UTF-8
- - de_DE.UTF-8
- - en_US.UTF-8
-
-debian_preseed_no_splash: no
-debian_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
+ primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246
network:
nameservers: "{{ network_zones.lan.dns }}"
@@ -46,8 +14,7 @@ network:
interfaces:
- *_network_primary_
-
-base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
-
-admin_users_host:
- - equinox
+apt_repo_components:
+ - main
+ - contrib
+ - non-free