From c2d647a3cb3a6d456684bcdce327954214352959 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Tue, 8 Nov 2022 12:00:47 -0500
Subject: Update edit and publish configs, tweak OBS, add Mumble client

---
 roles/publish/tasks/main.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

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

diff --git a/roles/publish/tasks/main.yml b/roles/publish/tasks/main.yml
index 128b0fa..c09cae2 100644
--- a/roles/publish/tasks/main.yml
+++ b/roles/publish/tasks/main.yml
@@ -54,28 +54,30 @@
     owner: "{{ emacsconf_user }}"
     group: "{{ emacsconf_group }}"
     create: yes
-- name: Set up compile-media
-  become_user: "{{ emacsconf_user }}"
-  git:
-    repo: https://github.com/sachac/compile-media.git
-    dest: "~{{ emacsconf_user }}/compile-media"
 - name: Set up or update repositories
   become_user: "{{ emacsconf_user }}"
-  tags: publish
+  tags: publish, wip
   block:
+    - name: Set up compile-media
+      git:
+        repo: https://github.com/sachac/compile-media.git
+        dest: "~{{ emacsconf_user }}/compile-media"
+    - name: Set up subed
+      git:
+        repo: https://github.com/sachac/subed.git
+        dest: "~{{ emacsconf_user }}/subed"
     - name: Check out wiki repository
       ansible.builtin.git:
-        repo: anon@git.emacsconf.org:/emacsconf-wiki
+        repo: anon@git.emacsconf.org:emacsconf-wiki
         dest: "{{ emacsconf_edit_wiki_dir }}"
-        ssh_opts: "-i ~/.ssh/id_rsa_anon_git_emacsconf -u anon"
-        key_file: "~{{ emacsconf_user }}/.ssh/id_rsa_anon_git_emacsconf"
+        ssh_opts: "-i /home/{{ emacsconf_user }}/.ssh/id_rsa_anon_git_emacsconf"
       register: wiki_clone
       failed_when:
         - wiki_clone.failed
         - not 'Local modifications exist in repository' in wiki_clone.msg
         - not 'Failed to checkout branch' in wiki_clone.msg
-    - name: Configure git to use
-      shell: git config core.sshCommand "ssh -i ~{{ emacsconf_user }}/.ssh/id_rsa_anon_git_emacsconf -F /dev/null"
+    - name: Set up key
+      shell: git config core.sshCommand "ssh -i ~/.ssh/id_rsa_anon_git_emacsconf -F /dev/null"
       args:
         chdir: "{{ emacsconf_edit_wiki_dir }}"
     - name: Check out emacsconf-el
@@ -103,6 +105,7 @@
   file:
     path: "{{ item }}"
     owner: "{{ emacsconf_user }}"
+    group: "{{ emacsconf_group }}"
     recurse: true
   loop:
     - "{{ emacs_config_dir }}"
@@ -119,8 +122,8 @@
       tags: publish-talk
       command: emacs -l "{{ emacs_config_dir }}/emacsconf-config.el" --batch --exec '(emacsconf-with-talk-heading "{{ slug }}" (emacsconf-update-talk))'
       when: slug is defined
-    - name: Commit the wiki and push
-      shell: cd {{ emacsconf_edit_wiki_dir }}; git commit -m 'Update from ansible' -a; git push
+    # - name: Commit the wiki and push
+    #   shell: cd {{ emacsconf_edit_wiki_dir }}; git commit -m 'Update from ansible' -a; git push
     - name: Publish the backstage index
-      command: emacs -l "{{ emacs_config_dir }}/emacsconf-config.el" --batch --exec '(emacsconf-publish-backstage-index)'
+      command: emacsclient -c -nw --exec '(emacsconf-publish-backstage-index)' -a emacs
       when: (publish|d("")) == "backstage"
-- 
cgit v1.2.3