diff options
| -rw-r--r-- | chaos-at-home/ch-telesto.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-telesto.yml | 3 | ||||
| -rw-r--r-- | roles/apt-repo/blackmagic/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/desktopvideo/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/desktopvideo/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/streaming/blackmagic/mediaexpress/tasks/main.yml | 9 |
6 files changed, 28 insertions, 7 deletions
diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml index a78517ce..bb34689d 100644 --- a/chaos-at-home/ch-telesto.yml +++ b/chaos-at-home/ch-telesto.yml @@ -12,3 +12,4 @@ - role: core/admin-users - role: apt-repo/spreadspace - role: streaming/blackmagic/desktopvideo + - role: streaming/blackmagic/mediaexpress diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml index a2d94e16..e9288ba7 100644 --- a/inventory/host_vars/ch-telesto.yml +++ b/inventory/host_vars/ch-telesto.yml @@ -77,3 +77,6 @@ ws_base_home_zfs: ws_base_extra_packages: - obs-studio + + +blackmagic_desktopvideo_include_gui: yes diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml index c2652ed3..c8a696b7 100644 --- a/roles/apt-repo/blackmagic/tasks/main.yml +++ b/roles/apt-repo/blackmagic/tasks/main.yml @@ -16,7 +16,7 @@ line: "machine build.spreadspace.org login {{ apt_repo_blackmagic_auth.username }} password {{ apt_repo_blackmagic_auth.password }}" create: yes mode: 0600 - register: apt_repo_blackmagic_auth_legacy + register: apt_repo_blackmagic_authconf_legacy - name: configure repo authentication when: (ansible_distribution == "Ubuntu") or @@ -27,7 +27,7 @@ path: /etc/apt/auth.conf regexp: "^machine build.spreadspace.org " state: absent - register: apt_repo_blackmagic_auth_legacy_remove + register: apt_repo_blackmagic_authconf_legacy_remove - name: configure repo authentication copy: @@ -37,7 +37,7 @@ password {{ apt_repo_blackmagic_auth.password }} dest: /etc/apt/auth.conf.d/blackmagic.conf mode: 0600 - register: apt_repo_blackmagic_auth + register: apt_repo_blackmagic_authconf - name: add repository entry @@ -49,9 +49,9 @@ - name: update apt cache when: apt_repo_blackmagic_key is changed or - apt_repo_blackmagic_auth_legacy is changed or - apt_repo_blackmagic_auth_legacy_remove is changed or - apt_repo_blackmagic_auth is changed or + apt_repo_blackmagic_authconf_legacy is changed or + apt_repo_blackmagic_authconf_legacy_remove is changed or + apt_repo_blackmagic_authconf is changed or apt_repo_blackmagic_sources is changed apt: update_cache: yes diff --git a/roles/streaming/blackmagic/desktopvideo/defaults/main.yml b/roles/streaming/blackmagic/desktopvideo/defaults/main.yml new file mode 100644 index 00000000..eddfbb61 --- /dev/null +++ b/roles/streaming/blackmagic/desktopvideo/defaults/main.yml @@ -0,0 +1,2 @@ +--- +blackmagic_desktopvideo_include_gui: no diff --git a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml index cd1de94c..d674b54e 100644 --- a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml +++ b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: install blackmagic repo - include_role: + import_role: name: apt-repo/blackmagic - name: install blackmagic desktopvideo @@ -8,6 +8,12 @@ name: desktopvideo state: present +- name: install blackmagic desktopvideo GUI + when: blackmagic_desktopvideo_include_gui + apt: + name: desktopvideo-gui + state: present + - name: install improved kill mode for DesktopVideoHelper (1/2) file: name: /etc/systemd/system/DesktopVideoHelper.service.d diff --git a/roles/streaming/blackmagic/mediaexpress/tasks/main.yml b/roles/streaming/blackmagic/mediaexpress/tasks/main.yml new file mode 100644 index 00000000..4376fdc3 --- /dev/null +++ b/roles/streaming/blackmagic/mediaexpress/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- name: install blackmagic repo + import_role: + name: apt-repo/blackmagic + +- name: install blackmagic mediaexpress + apt: + name: mediaexpress + state: present |