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

2 files changed, 0 insertions, 109 deletions

diff --git a/wiki/tasks/docker.yml b/wiki/tasks/docker.yml
deleted file mode 100644
index 1a759a4..0000000
--- a/wiki/tasks/docker.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-- name: Set up docker stuff if on docker
-  apt:
-    pkg:
-      - lighttpd
-      - supervisord
-- name: Create the anon user
-  user:
-    name: anon
-- name: Set up Ikiwiki setup
-  template:
-    src: emacsconf.setup
-    dest: "{{ ikiwiki_path }}/emacsconf.setup"
-    owner: www-data
-    group: www-data
-- name: Set up the ikiwiki directories
-  file:
-    dest: /var/www/html
-    state: directory
-    owner: www-data
-    group: www-data
-- name: Clone the bare git repo
-  git:
-    bare: true
-    repo: "{{ ikiwiki_git_source_mount }}"
-    dest: "{{ ikiwiki_bare_git_dir }}"
-    version: "{{ ikiwiki_git_branch }}"
-- name: Change owner
-  file:
-    dest: "{{ ikiwiki_bare_git_dir }}"
-    recurse: true
-    owner: www-data
-    group: www-data
-- name: Clone the working git repo
-  git:
-    repo: "{{ ikiwiki_bare_git_dir }}"
-    dest: "{{ ikiwiki_src_dir }}"
-    version: "{{ ikiwiki_git_branch }}"
-- name: Copy supervisor config
-  template:
-    src: supervisord.conf
-    dest: /etc/supervisor/conf.d/ikiwiki.conf
-- name: Start lighttpd
-  service:
-    name: lighttpd
-    state: started
-- name: Start supervisord
-  service:
-    name: supervisor
-    state: restarted
diff --git a/wiki/tasks/main.yml b/wiki/tasks/main.yml
deleted file mode 100644
index 35c297d..0000000
--- a/wiki/tasks/main.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: Set up packages
-  ansible.builtin.apt:
-    update_cache: true
-    pkg:
-      - ikiwiki
-      - git
-      - openssh-server
-      - libimage-magick-perl
-      - libtext-csv-perl
-      - libxml-writer-perl
-      - imagemagick
-      - nginx
-      - wget
-    state: present
-- name: Create ikiwiki group
-  group:
-    name: ikiwiki
-    state: present
-- name: Create ikiwiki user
-  user:
-    name: ikiwiki
-    group: ikiwiki
-    state: present
-- debug:
-    var: docker
-- name: Set up or update repositories
-  ansible.builtin.git:
-    repo: git://git.emacsconf.org/emacsconf-wiki
-    dest: "{{ ikiwiki_src_dir }}"
-  when: not docker|d(false)
-- name: Template the config
-  ansible.builtin.template:
-    src: emacsconf.setup
-    dest: "{{ ikiwiki_path }}/emacsconf.setup"
-    owner: ikiwiki
-- name: Copy Ikiwiki plugins
-  tags: wiki-plugins
-  template:
-    src: "{{ item }}"
-    dest: "{{ ikiwiki_plugin_path }}/{{ item }}"
-  loop:
-    - copyright.pm
-    - htmlscrubber.pm
-    - license.pm
-- include: docker.yml
-  when: docker is true
-- name: Chown all the files to ikiwiki
-  tags: wiki-plugins
-  file:
-    dest: "{{ ikiwiki_path }}"
-    owner: ikiwiki
-    group: ikiwiki
-    recurse: true
-- name: Regenerate all the files
-  tags: wiki-regenerate, wiki-plugins
-  shell: ikiwiki --setup "{{ ikiwiki_path }}/emacsconf.setup" --rebuild --wrappers
-  register: output
-- debug:
-    var: output