1 files changed, 27 insertions, 49 deletions
diff --git a/roles/obs/tasks/main.yml b/roles/obs/tasks/main.yml
index cb981b1..36e14c3 100644
--- a/roles/obs/tasks/main.yml
+++ b/roles/obs/tasks/main.yml
@@ -19,61 +19,39 @@
       - dbus-x11
       - obs-studio
       - xserver-xorg-dev
+      - xdotool
     update_cache: yes
-- name: Set up user
-  include: user.yml
-- name: Set up track bins for addition to paths
-  file:
-    path: "{{ emacsconf_home }}/bin/{{ item.id }}"
-    state: directory
-    owner: "{{ emacsconf_user }}"
-    group: "{{ emacsconf_group }}"
-  loop: "{{ emacsconf_tracks }}"
+- name: Add Firefox
+  apt:
+    name: firefox-esr
+  when: ansible_distribution == "Debian"
+- name: Add Firefox
+  apt:
+    name: firefox-esr
+  when: ansible_distribution == "Ubuntu"
 - name: Copy X11 config
   template:
     src: xorg.conf
     dest: /etc/X11/xorg.conf
-- name: Set up VNC
-  include: tigervnc.yml
-  tags: vnc, wip
 - name: Set up MPV and MPVC
   tags: mpv
   include: mpv.yml
-- name: Set up OBS profiles and scenes
-  tags: obs-profile
-  include: obs-setup.yml
-- name: Add FFMPEG script for streaming
-  template:
-    src: stream-desktop-with-ffmpeg.sh
-    dest: /home/{{ emacsconf_user }}/bin/{{ item.id }}/stream-desktop-with-ffmpeg
-    mode: 0775
-    owner: "{{ emacsconf_user }}"
-    group: "{{ emacsconf_group }}"
+- name: Set up track-specific things
+  include: track.yml
   loop: "{{ emacsconf_tracks }}"
-- name: Copy logo
-  copy:
-    src: logo.png
-    dest: "{{ emacsconf_home }}/logo.png"
-# - name: Start jack
-#   shell: jackd -r -ddummy
-#   async: 2592000
-- name: Set up pulse
-  include: pulse.yml
-  tags: pulse
-- name: Set up Firefox
-  tags: firefox
-  include: firefox.yml
-- name: Set up I3 directory
-  tags: wip
-  file:
-    path: "{{ emacsconf_home }}/.config/i3"
-    state: directory
-    owner: "{{ emacsconf_user }}"
-    group: "{{ emacsconf_group }}"
-- name: Set up I3
-  tags: wip
-  template:
-    src: i3-config
-    dest: "{{ emacsconf_home }}/.config/i3/config"
-    owner: "{{ emacsconf_user }}"
-    group: "{{ emacsconf_group }}"
+- debug:
+    var: emacsconf_home
+- name: Add packages
+  apt:
+    name:
+      - tigervnc-standalone-server
+      - tigervnc-common
+  tags: vnc
+- name: Allow SSH for the users
+  replace:
+    dest: /etc/ssh/sshd_config.d/emacsconf_ssh.conf
+    regexp: '(AllowUsers(?!.*\b{{ emacsconf_id }}-{{ item.id }}\b).*)$'
+    replace: \1 {{ emacsconf_id }}-{{ item.id }}
+  loop: "{{ emacsconf_tracks }}"
+
+