comment out live, front, and media

4 files changed, 34 insertions, 39 deletions

diff --git a/inventory.yml b/inventory.yml
index adccf66..59dfa11 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -18,43 +18,37 @@ prod:
       ansible_become: true
       emacsconf_group: org
       cpus: 12
-    # obs:
-    #   ansible_host: obs
-    #   remote_user: sacha
-    #   ansible_ssh_user: sacha
+    # front:
+    #   ansible_host: front0.emacsconf.org
+    #   remote_user: orga
+    #   ansible_ssh_user: orga
+    #   ansible_python_interpreter: /usr/bin/python3
+    #   ansible_become: true
+    # pad:
+    #   ansible_host: front0.emacsconf.org
+    #   remote_user: orga
+    #   ansible_ssh_user: orga
+    #   ansible_python_interpreter: /usr/bin/python3
+    #   ansible_become: true
+    # media:
+    #   ansible_host: media.emacsconf.org
+    #   remote_user: orga
+    #   ansible_ssh_user: orga
+    #   ansible_python_interpreter: /usr/bin/python3
+    #   ansible_become: true
+    #   host_name: media.emacsconf.org
+    # upload:
+    #   ansible_host: media.emacsconf.org
+    #   remote_user: orga
+    #   ansible_ssh_user: orga
+    #   ansible_python_interpreter: /usr/bin/python3
+    #   ansible_become: true
+    # stream:
+    #   ansible_host: live0.emacsconf.org
+    #   remote_user: orga
+    #   ansible_ssh_user: orga
     #   ansible_python_interpreter: /usr/bin/python3
     #   ansible_become: true
-    front:
-      ansible_host: front0.emacsconf.org
-      remote_user: orga
-      ansible_ssh_user: orga
-      ansible_python_interpreter: /usr/bin/python3
-      ansible_become: true
-    pad:
-      ansible_host: front0.emacsconf.org
-      remote_user: orga
-      ansible_ssh_user: orga
-      ansible_python_interpreter: /usr/bin/python3
-      ansible_become: true
-    media:
-      ansible_host: media.emacsconf.org
-      remote_user: orga
-      ansible_ssh_user: orga
-      ansible_python_interpreter: /usr/bin/python3
-      ansible_become: true
-      host_name: media.emacsconf.org
-    upload:
-      ansible_host: media.emacsconf.org
-      remote_user: orga
-      ansible_ssh_user: orga
-      ansible_python_interpreter: /usr/bin/python3
-      ansible_become: true
-    stream:
-      ansible_host: live0.emacsconf.org
-      remote_user: orga
-      ansible_ssh_user: orga
-      ansible_python_interpreter: /usr/bin/python3
-      ansible_become: true
 all:
   hosts:
     localhost:
diff --git a/roles/edit/templates/emacsconf-edit.el b/roles/edit/templates/emacsconf-edit.el
index b659121..6ca3efa 100644
--- a/roles/edit/templates/emacsconf-edit.el
+++ b/roles/edit/templates/emacsconf-edit.el
@@ -85,4 +85,4 @@
 
 (find-file "{{ emacsconf_private_dir }}/conf.org")
 (emacsconf-add-org-after-todo-state-change-hook)
-(emacsconf-erc-connect)
+(unless noninteractive (emacsconf-erc-connect))
diff --git a/roles/prerec/tasks/main.yml b/roles/prerec/tasks/main.yml
index c635693..032e3d2 100644
--- a/roles/prerec/tasks/main.yml
+++ b/roles/prerec/tasks/main.yml
@@ -27,3 +27,4 @@
     - update-task-status.sh
     - upload.sh
     - publish-backstage-index.sh
+    - update-emacsconf.sh
diff --git a/roles/prerec/templates/update-task-status.sh b/roles/prerec/templates/update-task-status.sh
index c9ac142..d2500e1 100755
--- a/roles/prerec/templates/update-task-status.sh
+++ b/roles/prerec/templates/update-task-status.sh
@@ -3,8 +3,8 @@
 SLUG="$1"
 FROM_STATUS="$2"
 TO_STATUS="$3"
-cd ~/emacsconf-2022-private
+cd {{ emacsconf_private_dir }}
 git pull
-emacsclient -a emacs --eval "(progn (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\") (emacsconf-with-talk-heading \"$SLUG\" (emacsconf-cache-video-data (emacsconf-get-talk-info-for-subtree)) (save-buffer)))"
-git commit -m "Update task status for $SLUG" conf.org
+emacsclient -a emacs --eval "(emacsconf-with-todo-hooks (emacsconf-update-talk-status \"$SLUG\" \"$FROM_STATUS\" \"$TO_STATUS\"))"
+git commit -m "Update task status for $SLUG from $FROM_STATUS to $TO_STATUS" conf.org
 git push