diff options
| -rw-r--r-- | chaos-at-home/ch-calypso.yml | 1 | ||||
| -rw-r--r-- | chaos-at-home/ch-telesto.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-calypso.yml | 9 | ||||
| -rw-r--r-- | inventory/host_vars/ch-dione.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ch-helene.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ch-telesto.yml | 11 | ||||
| -rw-r--r-- | inventory/host_vars/s2-thetys.yml | 2 | ||||
| -rw-r--r-- | roles/apt-repo/spreadspace/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/apt-repo/spreadspace/tasks/main.yml | 2 |
9 files changed, 24 insertions, 9 deletions
diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml index 0d6c4202..55246bb2 100644 --- a/chaos-at-home/ch-calypso.yml +++ b/chaos-at-home/ch-calypso.yml @@ -8,6 +8,7 @@ - role: core/zsh - role: core/cpu-microcode - role: zfs/base + - role: apt-repo/obs-studio - role: apt-repo/spreadspace - role: ws/base - role: core/admin-users diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml index 14f868ad..a3ab6126 100644 --- a/chaos-at-home/ch-telesto.yml +++ b/chaos-at-home/ch-telesto.yml @@ -8,6 +8,7 @@ - role: core/zsh - role: core/cpu-microcode - role: zfs/base + - role: apt-repo/obs-studio - role: apt-repo/spreadspace - role: ws/base - role: core/admin-users diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml index 1f4c19d6..7a626488 100644 --- a/inventory/host_vars/ch-calypso.yml +++ b/inventory/host_vars/ch-calypso.yml @@ -47,6 +47,10 @@ apt_repo_components: - universe - multiverse +spreadspace_apt_repo_components: + - main + - streaming + base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" admin_users_host: @@ -62,6 +66,7 @@ zfs_pools: create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811 ws_base_extra_packages: + # needs apt-repo/obs-studio - obs-studio ws_base_lightdm_defaults: @@ -69,7 +74,7 @@ ws_base_lightdm_defaults: autologin-user-timeout: 0 -blackmagic_desktopvideo_version: 11.1a11 +blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes -blackmagic_mediaexpress_version: 3.5.9a10 +blackmagic_mediaexpress_version: 3.6.2a2 diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 8c1f9aad..b5abb06c 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -61,7 +61,7 @@ admin_users_host: - equinox -blackmagic_desktopvideo_version: 11.1a11 +blackmagic_desktopvideo_version: 11.7a12 docker_lvm: diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index f1c1f316..19f0b80e 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -57,7 +57,7 @@ admin_users_host: - equinox -blackmagic_desktopvideo_version: 11.1a11 +blackmagic_desktopvideo_version: 11.7a12 docker_lvm: diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml index 9dc820d2..699570d5 100644 --- a/inventory/host_vars/ch-telesto.yml +++ b/inventory/host_vars/ch-telesto.yml @@ -47,6 +47,10 @@ apt_repo_components: - universe - multiverse +spreadspace_apt_repo_components: + - main + - streaming + base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" admin_users_host: @@ -62,14 +66,15 @@ zfs_pools: create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810 ws_base_extra_packages: + # needs apt-repo/obs-studio - obs-studio -ws_base_lightdm_seat_defaults: +ws_base_lightdm_defaults: autologin-user: equinox autologin-user-timeout: 0 -blackmagic_desktopvideo_version: 11.1a11 +blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes -blackmagic_mediaexpress_version: 3.5.9a10 +blackmagic_mediaexpress_version: 3.6.2a2 diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index f72c6e25..d2d99006 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -29,7 +29,7 @@ apt_repo_components: - non-free ## for microcode updates -blackmagic_desktopvideo_version: 11.1a11 +blackmagic_desktopvideo_version: 11.7a12 docker_pkg_provider: docker-com diff --git a/roles/apt-repo/spreadspace/defaults/main.yml b/roles/apt-repo/spreadspace/defaults/main.yml new file mode 100644 index 00000000..4a497ae4 --- /dev/null +++ b/roles/apt-repo/spreadspace/defaults/main.yml @@ -0,0 +1,3 @@ +--- +spreadspace_apt_repo_components: + - main diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml index dd6384b1..6fe9eeea 100644 --- a/roles/apt-repo/spreadspace/tasks/main.yml +++ b/roles/apt-repo/spreadspace/tasks/main.yml @@ -8,7 +8,7 @@ - name: add repository entry copy: content: | - deb https://build.spreadspace.org/ {{ ansible_distribution_release }} main + deb https://build.spreadspace.org/ {{ ansible_distribution_release }} {{ spreadspace_apt_repo_components | join(' ') }} dest: /etc/apt/sources.list.d/spreadspace.list register: apt_repo_spreadspace_sources |