4 files changed, 12 insertions, 8 deletions
diff --git a/roles/publish/defaults/main.yml b/roles/publish/defaults/main.yml
index 52ec596..19a12d8 100644
--- a/roles/publish/defaults/main.yml
+++ b/roles/publish/defaults/main.yml
@@ -1,6 +1,6 @@
 emacsconf_org_file: "{{ emacsconf_private_dir }}/conf.org"
 emacsconf_publishing_phase: schedule
-emacs_version: 28.2
+emacs_version: 29.1
 emacs_build_parent: /usr/src/emacs
 emacs_build_dir: "{{ emacs_build_parent }}/emacs-{{ emacs_version }}"
 emacsconf_wiki_branch: master
diff --git a/roles/publish/tasks/emacs.yml b/roles/publish/tasks/emacs.yml
index 3944876..d961878 100644
--- a/roles/publish/tasks/emacs.yml
+++ b/roles/publish/tasks/emacs.yml
@@ -8,6 +8,8 @@
       - pkg-config
       - libjansson-dev
       - libgnutls28-dev
+      - libtiff-dev
+      - libtiff5-dev
       - automake
       - texinfo
     state: present
diff --git a/roles/publish/tasks/main.yml b/roles/publish/tasks/main.yml
index 0724bdd..797ac7f 100644
--- a/roles/publish/tasks/main.yml
+++ b/roles/publish/tasks/main.yml
@@ -25,8 +25,8 @@
   register: emacs
 - name: Set up Emacs
   become: yes
-  include: emacs.yml
-  when: not emacs.stat.exists
+  import_tasks: emacs.yml
+  # when: not emacs.stat.exists
 - name: Configure git
   template:
     src: git-config
@@ -68,7 +68,7 @@
         dest: "~{{ emacsconf_user }}/subed"
     - name: Check out wiki repository
       ansible.builtin.git:
-        repo: anon@git.emacsconf.org:emacsconf-wiki
+        repo: "{{ emacsconf_publishing_source }}"
         dest: "{{ emacsconf_edit_wiki_dir }}"
         ssh_opts: "-i /home/{{ emacsconf_user }}/.ssh/id_rsa_anon_git_emacsconf"
       register: wiki_clone
diff --git a/roles/publish/templates/emacsconf-config.el b/roles/publish/templates/emacsconf-config.el
index 0c7a80b..767de85 100644
--- a/roles/publish/templates/emacsconf-config.el
+++ b/roles/publish/templates/emacsconf-config.el
@@ -15,22 +15,24 @@
 (setq emacsconf-ansible-directory "{{ emacsconf_ansible_directory }}")
 {% endif %}
 (setq emacsconf-pad-api-key "{{ etherpad_api_key }}")
-(setq emacsconf-publishing-phase '{{ emacsconf_publishing_phase }})
+(setq emacsconf-publishing-phase 'conference)
 (setq emacsconf-backstage-password "{{ emacsconf_backstage_password }}")
 
+(setq emacsconf-public-media-directory "/ssh:orga@media.emacsconf.org:/var/www/media.emacsconf.org/{{ emacsconf_year }}")
 (setq emacsconf-backstage-dir "/ssh:orga@media.emacsconf.org:/var/www/media.emacsconf.org/{{ emacsconf_year }}/backstage")
 (setq emacsconf-upload-dir "/ssh:orga@media.emacsconf.org:/srv/upload")
 
 {% if ansible_host == "res.emacsconf.org" %}
-(setq emacsconf-res-dir "/data/{{ emacsconf_id }}/{{ emacsconf_year}}")
-(setq emacsconf-cache-dir "/data/{{ emacsconf_id }}/cache")
+(setq emacsconf-res-dir "/data/{{ emacsconf_id }}/shared/{{ emacsconf_year}}")
+(setq emacsconf-cache-dir "/data/{{ emacsconf_id }}/shared/{{ emacsconf_year}}/cache")
 (setq emacsconf-stream-host "localhost")
 (setq emacsconf-stream-overlay-dir "{{ emacsconf_caption_dir }}/assets/overlays")
 (setq emacsconf-stream-asset-dir "{{ emacsconf_caption_dir }}/assets")
 {% else %}
-(setq emacsconf-res-dir (format "/ssh:orga@res.emacsconf.org:/data/emacsconf/%s" emacsconf-year))
+(setq emacsconf-res-dir (format "/ssh:orga@res.emacsconf.org:/data/emacsconf/admin/%s" emacsconf-year))
 {% endif %}
 
+(setq emacsconf-publish-autocommit-wiki t)
 (add-to-list 'load-path "~/compile-media")
 (add-to-list 'load-path "~/subed/subed")
 (require 'compile-media)