From 2be81b299be9cad0b03495f2ea038a01969c6cb2 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Tue, 1 Oct 2024 19:59:03 -0400
Subject: Update for new ansible version

---
 roles/obs/tasks/main.yml | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

(limited to 'roles/obs/tasks/main.yml')

diff --git a/roles/obs/tasks/main.yml b/roles/obs/tasks/main.yml
index 249a0bb..5df7d56 100644
--- a/roles/obs/tasks/main.yml
+++ b/roles/obs/tasks/main.yml
@@ -49,9 +49,9 @@
     dest: /etc/X11/xorg.conf
 - name: Set up MPV and MPVC
   tags: mpv
-  include: mpv.yml
+  include_tasks: mpv.yml
 - name: Set up track-specific things
-  include: track.yml
+  include_tasks: track.yml
   loop: "{{ emacsconf_tracks }}"
 - debug:
     var: emacsconf_home
@@ -82,14 +82,29 @@
     line: export TZ={{ emacsconf_timezone }}
     dest: "/home/{{ emacsconf_user }}/.bashrc"
 - name: Allow sudo from {{ emacsconf_user }} to the stream users
+  tags: obs-sudo
   become: true
   become_user: root
-  copy:
-    content: |
-      {% for item in emacsconf_tracks %}
-        {{ emacsconf_user }}  ALL=({{ emacsconf_id }}-{{ item.id }}) NOPASSWD: ALL
-      {% endfor %}    
-    dest: /etc/sudoers.d/50_emacsconf
+  community.general.sudoers:
+    name: "{{ emacsconf_user }}-{{ emacsconf_id }}-{{ item.id }}"
+    user: "{{ emacsconf_user }}"
+    runas: "{{emacsconf_id }}-{{ item.id }}"
+    commands: ALL
+    nopassword: true
+  with_items:
+    - "{{ emacsconf_tracks }}"
+- name: Allow sudo from the stream users to the {{ emacsconf_user }}
+  tags: obs-sudo
+  become: true
+  become_user: root
+  community.general.sudoers:
+    name: "{{ emacsconf_id }}-{{ item.id }}-{{ emacsconf_user }}"
+    user: "{{emacsconf_id }}-{{ item.id }}"
+    runas: "{{ emacsconf_user }}"
+    commands: ALL
+    nopassword: true
+  with_items:
+    - "{{ emacsconf_tracks }}"
 - name: Create directories
   file:
     owner: "{{ emacsconf_user }}"
@@ -106,9 +121,13 @@
   loop:
     - overlay
     - music
+    - stop-music
     - play
     - play-with-intro
     - intro
     - bbb
     - pad
+    - handle-qa
     - handle-session
+    - reset-state
+    - rebroadcast
-- 
cgit v1.2.3