summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-12-28 05:40:19 +0100
committerChristian Pointner <equinox@spreadspace.org>2020-12-28 05:40:19 +0100
commitb51b4c64e8cd1a744e2e144fdf7b114e0f8ed20b (patch)
tree220ca99d27b2c9b2c7a7793031864d273ab321e4 /roles
parentdebian/preseed: manual partitioning (diff)
blackmagic add gui stuff
Diffstat (limited to 'roles')
-rw-r--r--roles/apt-repo/blackmagic/tasks/main.yml12
-rw-r--r--roles/streaming/blackmagic/desktopvideo/defaults/main.yml2
-rw-r--r--roles/streaming/blackmagic/desktopvideo/tasks/main.yml8
-rw-r--r--roles/streaming/blackmagic/mediaexpress/tasks/main.yml9
4 files changed, 24 insertions, 7 deletions
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