Merge branch 'main' of git.emacsconf.org:pub/emacsconf-ansible into main

3 files changed, 0 insertions, 97 deletions

diff --git a/wiki-publish/defaults/main.yml b/wiki-publish/defaults/main.yml
deleted file mode 100644
index c6ca568..0000000
--- a/wiki-publish/defaults/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-emacsconf_year: 2022
-emacsconf_org_file: "{{ emacsconf_private_dir }}/conf.org"
-emacsconf_publishing_phase: schedule
-emacsconf_el_dir: ~/emacsconf-el
-emacsconf_edit_wiki_dir: ~/emacsconf-wiki
-emacsconf_private_dir: ~/emacsconf-2022-private
-emacs_config_dir: ~/.emacs.d
diff --git a/wiki-publish/tasks/main.yml b/wiki-publish/tasks/main.yml
deleted file mode 100644
index 897cecc..0000000
--- a/wiki-publish/tasks/main.yml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- name: Set up SSH directory
-  ansible.builtin.file:
-    path: /home/ikiwiki/.ssh
-    state: directory
-    mode: '0700'
-- name: Install SSH key for EmacsConf wiki
-  ansible.builtin.get_url:
-    url: https://emacsconf.org/id_rsa_anon_git_emacsconf
-    dest: /home/ikiwiki/.ssh/id_rsa_anon_git_emacsconf
-    mode: '0600'
-    owner: 'ikiwiki'
-- name: Set up packages
-  become: yes
-  block:
-    # This repository is currently not working
-    # - name: Add snapshot repository
-    #   ansible.builtin.apt_repository:
-    #     repo: deb http://emacs.ganneff.de/ buster main
-    - name: Remove old package
-      ansible.builtin.apt:
-        name: emacs
-        state: absent
-    - name: Install Emacs snapshot
-      ansible.builtin.apt:
-        name: emacs-snapshot-nox
-        state: present
-- name: Set up Emacs configuration for non-interactive publishing
-  become: true
-  become_user: "{{ emacsconf_publish_user }}"
-  template:
-    src: emacsconf-config.el
-    dest: "{{ emacs_config_dir }}/emacsconf-config.el"
-- name: Check if Emacs base configuration already exists
-  become: true
-  become_user: "{{ emacsconf_publish_user }}"
-  lineinfile:
-    dest: "{{ emacs_config_dir }}/init.el"
-    state: present
-    regexp: "emacsconf-config"
-    line: "(load-file \"emacsconf-config.el\")"
-- name: Set up or update repositories
-  become: false
-  tags: publish
-  block:
-    - name: Check out wiki repository
-      ansible.builtin.git:
-        repo: git://git.emacsconf.org/emacsconf-wiki
-        dest: "{{ emacsconf_edit_wiki_dir }}"
-    - name: Check out emacsconf-el
-      ansible.builtin.git:
-        repo: git@git.emacsconf.org:pub/emacsconf-el
-        dest: "{{ emacsconf_el_dir }}"
-      register: elisp
-    - name: Check out emacsconf-2022-private
-      ansible.builtin.git:
-        repo: git@git.emacsconf.org:emacsconf-2022-private
-        dest: "{{ emacsconf_private_dir }}"
-      register: private
-- name: Publish
-  tags: publish
-  block:
-    - name: Publish the schedule
-      command: emacs -l "{{ emacsconf_config_dir }}/emacsconf-config.el" --batch --exec '(emacsconf-generate-main-schedule)'
-      when: (force_publish|d(false)) or ((private.changed or elisp.changed) and slug is not defined)
-    - name: Update a specific talk's nav page
-      tags: publish-talk
-      command: emacs -l "{{ emacsconf_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
diff --git a/wiki-publish/templates/emacsconf-config.el b/wiki-publish/templates/emacsconf-config.el
deleted file mode 100644
index 53ffe64..0000000
--- a/wiki-publish/templates/emacsconf-config.el
+++ /dev/null
@@ -1,19 +0,0 @@
-(add-to-list 'load-path "{{ emacsconf_el_dir }}")
-(require 'emacsconf)
-(require 'emacsconf-publish)
-(require 'emacsconf-schedule)
-(org-babel-do-load-languages  'org-babel-load-languages '((emacs-lisp . t) (shell . t)))
-(setq emacsconf-year "{{ emacsconf_year }}")
-(setq emacsconf-org-file "{{ emacsconf_org_file }}")
-(setq emacsconf-directory "{{ emacsconf_edit_wiki_dir }}")
-{% if emacsconf_streaming_nick is defined %}
-(setq emacsconf-streaming-nick "{{ emacsconf_streaming_nick }}")
-{% endif %}
-{% if emacsconf_org_tag is defined %}
-(setq emacsconf-org-tag "{{ emacsconf_org_tag }}")
-{% endif %}
-{% if emacsconf_ansible_directory is defined %}
-(setq emacsconf-ansible-directory "{{ emacsconf_ansible_directory }}")
-{% endif %}
-(setq emacsconf-pad-api-key "{{ etherpad_api_key }}")
-(setq emacsconf-publishing-phase '{{ emacsconf_publishing_phase }})