diff options
| author | Sacha Chua <sacha@sachachua.com> | 2024-10-01 19:59:03 -0400 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2024-10-01 19:59:03 -0400 |
| commit | 2be81b299be9cad0b03495f2ea038a01969c6cb2 (patch) | |
| tree | 6f798cdf8233d0c1079eaff3a52fd3bdabf8bdf7 /roles/publish | |
| parent | a50799ae2d27ea57f9f470a9ecfb06dd77499c34 (diff) | |
| download | emacsconf-ansible-2be81b299be9cad0b03495f2ea038a01969c6cb2.tar.xz emacsconf-ansible-2be81b299be9cad0b03495f2ea038a01969c6cb2.zip | |
Update for new ansible version
Diffstat (limited to 'roles/publish')
| -rw-r--r-- | roles/publish/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/publish/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/publish/templates/emacsconf-config.el | 6 |
3 files changed, 7 insertions, 5 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/main.yml b/roles/publish/tasks/main.yml index 0724bdd..546a4f0 100644 --- a/roles/publish/tasks/main.yml +++ b/roles/publish/tasks/main.yml @@ -25,7 +25,7 @@ register: emacs - name: Set up Emacs become: yes - include: emacs.yml + import_tasks: emacs.yml when: not emacs.stat.exists - name: Configure git template: @@ -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..05f705a 100644 --- a/roles/publish/templates/emacsconf-config.el +++ b/roles/publish/templates/emacsconf-config.el @@ -15,9 +15,10 @@ (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") @@ -28,9 +29,10 @@ (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) |