From 07609dd3ddb1bb1383b8ddbecc50bacd2e649918 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 19 Aug 2020 23:03:18 +0200 Subject: move blackmagic desktopvideo role --- dan/ele-dione.yml | 2 +- dan/ele-helene.yml | 2 +- dan/ele-telesto.yml | 2 +- dan/ele-thetys.yml | 2 +- dan/ele-uhrturm.yml | 2 +- .../files/DesktopVideoHelper-killmode.conf | 3 --- roles/blackmagic-desktopvideo/handlers/main.yml | 4 ---- roles/blackmagic-desktopvideo/tasks/main.yml | 27 ---------------------- .../files/DesktopVideoHelper-killmode.conf | 3 +++ .../blackmagic/desktopvideo/handlers/main.yml | 4 ++++ .../blackmagic/desktopvideo/tasks/main.yml | 27 ++++++++++++++++++++++ spreadspace/lw-dione.yml | 2 +- spreadspace/lw-helene.yml | 2 +- spreadspace/lw-telesto.yml | 2 +- spreadspace/lw-thetys.yml | 2 +- spreadspace/s2-calypso.yml | 2 +- spreadspace/s2-dione.yml | 2 +- spreadspace/s2-helene.yml | 2 +- spreadspace/s2-telesto.yml | 2 +- spreadspace/s2-thetys.yml | 2 +- 20 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 roles/blackmagic-desktopvideo/files/DesktopVideoHelper-killmode.conf delete mode 100644 roles/blackmagic-desktopvideo/handlers/main.yml delete mode 100644 roles/blackmagic-desktopvideo/tasks/main.yml create mode 100644 roles/streaming/blackmagic/desktopvideo/files/DesktopVideoHelper-killmode.conf create mode 100644 roles/streaming/blackmagic/desktopvideo/handlers/main.yml create mode 100644 roles/streaming/blackmagic/desktopvideo/tasks/main.yml diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml index 136b2133..fe6a0593 100644 --- a/dan/ele-dione.yml +++ b/dan/ele-dione.yml @@ -8,5 +8,5 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: chrony diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml index c9846212..a18477b9 100644 --- a/dan/ele-helene.yml +++ b/dan/ele-helene.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: chrony post_tasks: ## this is needed for local rtmp proxy diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml index d16f5fc4..0e0470b2 100644 --- a/dan/ele-telesto.yml +++ b/dan/ele-telesto.yml @@ -8,6 +8,6 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - role: ubuntu-ws diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index f79571a7..9c5f8362 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -9,6 +9,6 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base diff --git a/dan/ele-uhrturm.yml b/dan/ele-uhrturm.yml index 2baad426..e84ac63b 100644 --- a/dan/ele-uhrturm.yml +++ b/dan/ele-uhrturm.yml @@ -8,6 +8,6 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - role: docker diff --git a/roles/blackmagic-desktopvideo/files/DesktopVideoHelper-killmode.conf b/roles/blackmagic-desktopvideo/files/DesktopVideoHelper-killmode.conf deleted file mode 100644 index 6d61360b..00000000 --- a/roles/blackmagic-desktopvideo/files/DesktopVideoHelper-killmode.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -TimeoutStopSec=5s -KillMode=mixed diff --git a/roles/blackmagic-desktopvideo/handlers/main.yml b/roles/blackmagic-desktopvideo/handlers/main.yml deleted file mode 100644 index bb7fde2b..00000000 --- a/roles/blackmagic-desktopvideo/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: reload systemd - systemd: - daemon_reload: yes diff --git a/roles/blackmagic-desktopvideo/tasks/main.yml b/roles/blackmagic-desktopvideo/tasks/main.yml deleted file mode 100644 index cd1de94c..00000000 --- a/roles/blackmagic-desktopvideo/tasks/main.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- name: install blackmagic repo - include_role: - name: apt-repo/blackmagic - -- name: install blackmagic desktopvideo - apt: - name: desktopvideo - state: present - -- name: install improved kill mode for DesktopVideoHelper (1/2) - file: - name: /etc/systemd/system/DesktopVideoHelper.service.d - state: directory - -- name: install improved kill mode for DesktopVideoHelper (1/2) - copy: - src: DesktopVideoHelper-killmode.conf - dest: /etc/systemd/system/DesktopVideoHelper.service.d/killmode.conf - notify: reload systemd - -- name: make sure DesktopVideoHelper is disabled and stopped - systemd: - name: DesktopVideoHelper.service - daemon_reload: yes - state: stopped - enabled: no diff --git a/roles/streaming/blackmagic/desktopvideo/files/DesktopVideoHelper-killmode.conf b/roles/streaming/blackmagic/desktopvideo/files/DesktopVideoHelper-killmode.conf new file mode 100644 index 00000000..6d61360b --- /dev/null +++ b/roles/streaming/blackmagic/desktopvideo/files/DesktopVideoHelper-killmode.conf @@ -0,0 +1,3 @@ +[Service] +TimeoutStopSec=5s +KillMode=mixed diff --git a/roles/streaming/blackmagic/desktopvideo/handlers/main.yml b/roles/streaming/blackmagic/desktopvideo/handlers/main.yml new file mode 100644 index 00000000..bb7fde2b --- /dev/null +++ b/roles/streaming/blackmagic/desktopvideo/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: reload systemd + systemd: + daemon_reload: yes diff --git a/roles/streaming/blackmagic/desktopvideo/tasks/main.yml b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml new file mode 100644 index 00000000..cd1de94c --- /dev/null +++ b/roles/streaming/blackmagic/desktopvideo/tasks/main.yml @@ -0,0 +1,27 @@ +--- +- name: install blackmagic repo + include_role: + name: apt-repo/blackmagic + +- name: install blackmagic desktopvideo + apt: + name: desktopvideo + state: present + +- name: install improved kill mode for DesktopVideoHelper (1/2) + file: + name: /etc/systemd/system/DesktopVideoHelper.service.d + state: directory + +- name: install improved kill mode for DesktopVideoHelper (1/2) + copy: + src: DesktopVideoHelper-killmode.conf + dest: /etc/systemd/system/DesktopVideoHelper.service.d/killmode.conf + notify: reload systemd + +- name: make sure DesktopVideoHelper is disabled and stopped + systemd: + name: DesktopVideoHelper.service + daemon_reload: yes + state: stopped + enabled: no diff --git a/spreadspace/lw-dione.yml b/spreadspace/lw-dione.yml index a4058d21..f0a3ce59 100644 --- a/spreadspace/lw-dione.yml +++ b/spreadspace/lw-dione.yml @@ -8,5 +8,5 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: chrony diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml index 082fc6de..5b2afda3 100644 --- a/spreadspace/lw-helene.yml +++ b/spreadspace/lw-helene.yml @@ -8,5 +8,5 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: chrony diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml index f960bef2..2f2794ad 100644 --- a/spreadspace/lw-telesto.yml +++ b/spreadspace/lw-telesto.yml @@ -8,7 +8,7 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace - role: ubuntu-ws - role: wireguard/base diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml index 21c98c95..c47c72d7 100644 --- a/spreadspace/lw-thetys.yml +++ b/spreadspace/lw-thetys.yml @@ -9,7 +9,7 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base - role: wireguard/base diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml index a1415af5..cad94c38 100644 --- a/spreadspace/s2-calypso.yml +++ b/spreadspace/s2-calypso.yml @@ -9,4 +9,4 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml index 89b1fcfa..fa4f9344 100644 --- a/spreadspace/s2-dione.yml +++ b/spreadspace/s2-dione.yml @@ -9,4 +9,4 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml index ec8ec11c..1abaa383 100644 --- a/spreadspace/s2-helene.yml +++ b/spreadspace/s2-helene.yml @@ -9,4 +9,4 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml index c933d7d0..83e4714d 100644 --- a/spreadspace/s2-telesto.yml +++ b/spreadspace/s2-telesto.yml @@ -8,5 +8,5 @@ - role: core/zsh - role: core/cpu-microcode - role: core/admin-users - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: apt-repo/spreadspace diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml index 1ad4da1d..2fe73691 100644 --- a/spreadspace/s2-thetys.yml +++ b/spreadspace/s2-thetys.yml @@ -9,6 +9,6 @@ - role: core/cpu-microcode - role: core/admin-users - role: apt-repo/spreadspace - - role: blackmagic-desktopvideo + - role: streaming/blackmagic/desktopvideo - role: kubernetes/base - role: kubernetes/standalone/base -- cgit v1.2.3