summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/ch-installsmb.yml4
-rw-r--r--roles/apt-repo/backports/defaults/main.yml10
2 files changed, 10 insertions, 4 deletions
diff --git a/inventory/host_vars/ch-installsmb.yml b/inventory/host_vars/ch-installsmb.yml
index 1587c6bf..5b463d86 100644
--- a/inventory/host_vars/ch-installsmb.yml
+++ b/inventory/host_vars/ch-installsmb.yml
@@ -1,7 +1,7 @@
---
install:
vm:
- memory: 1536M
+ memory: 3072M
numcpus: 2
autostart: false
disks:
@@ -62,7 +62,7 @@ openwrt_mixin:
boot() {
mkdir -p /srv/install-media
- mount -t tmpfs -o size=1400M install-media /srv/install-media
+ mount -t tmpfs -o size=2560M install-media /srv/install-media
}
openwrt_uci:
diff --git a/roles/apt-repo/backports/defaults/main.yml b/roles/apt-repo/backports/defaults/main.yml
index 6b9e462b..d2eba6aa 100644
--- a/roles/apt-repo/backports/defaults/main.yml
+++ b/roles/apt-repo/backports/defaults/main.yml
@@ -1,7 +1,13 @@
---
+_apt_repo_base_components_debian_:
+ until_bullseye:
+ - main
+ after_bullseye:
+ - main
+ - non-free-firmware
+
apt_repo_backports_components:
ubuntu:
- main
- universe
- debian:
- - main
+ debian: "{{ ((ansible_distribution_major_version | int) <= 11) | ternary(_apt_repo_base_components_debian_.until_bullseye, _apt_repo_base_components_debian_.after_bullseye) }}"