From fd21fd008d8774f1138b9bdcfd7c3f52ca9f3494 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 28 Apr 2021 19:00:10 +0200
Subject: [PATCH] Update to 2021-04-28 19:00

---
 roles/jitsi_jibri/tasks/conf.yml                        | 9 +++++++++
 roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2 | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/roles/jitsi_jibri/tasks/conf.yml b/roles/jitsi_jibri/tasks/conf.yml
index 9a9c3fc..03a5416 100644
--- a/roles/jitsi_jibri/tasks/conf.yml
+++ b/roles/jitsi_jibri/tasks/conf.yml
@@ -7,3 +7,12 @@
     - jibri.conf
   notify: restart jitsi-jibri
   tags: jitsi
+
+- name: Configure pam
+  copy:
+    content: |
+      #%PAM-1.0
+      auth    required pam_permit.so
+      account required pam_permit.so
+    dest: /etc/pam.d/xserver
+  tags: jitsi
diff --git a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2 b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
index 6d48f0f..559a067 100644
--- a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
+++ b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
@@ -6,7 +6,8 @@ After=network.target
 User={{ jitsi_jibri_user }}
 Group={{ jitsi_jibri_user }}
 Environment=DISPLAY=:0
-ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -config {{ jitsi_root_dir }}/etc/jibri/xorg-video-dummy.conf :0
+WorkingDirectory={{ jitsi_root_dir }}/etc/jibri/
+ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -config xorg-video-dummy.conf :0
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure