From 830f627d38a1476af3a96c554157ee95b03a2ba0 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Sat, 15 Oct 2022 19:35:13 -0400
Subject: Fix wiki task

---
 prod-playbook.yml              | 4 ++++
 wiki/tasks/docker.yml          | 6 +++++-
 wiki/tasks/main.yml            | 5 ++++-
 wiki/templates/htmlscrubber.pm | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/prod-playbook.yml b/prod-playbook.yml
index 063015d..81b6911 100644
--- a/prod-playbook.yml
+++ b/prod-playbook.yml
@@ -4,6 +4,10 @@
   tasks:
     - include_vars:
         file: prod-vars.yml
+- name: Set up wiki for publishing
+  hosts: front
+  roles:
+    - wiki
 - name: Set up wiki for publishing
   hosts: publish
   roles:
diff --git a/wiki/tasks/docker.yml b/wiki/tasks/docker.yml
index a5d73e2..1a759a4 100644
--- a/wiki/tasks/docker.yml
+++ b/wiki/tasks/docker.yml
@@ -2,7 +2,7 @@
   apt:
     pkg:
       - lighttpd
-      - supervisor
+      - supervisord
 - name: Create the anon user
   user:
     name: anon
@@ -43,3 +43,7 @@
   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
index 0fa2336..35c297d 100644
--- a/wiki/tasks/main.yml
+++ b/wiki/tasks/main.yml
@@ -35,9 +35,10 @@
     dest: "{{ ikiwiki_path }}/emacsconf.setup"
     owner: ikiwiki
 - name: Copy Ikiwiki plugins
+  tags: wiki-plugins
   template:
     src: "{{ item }}"
-    dest: "{{ ikiwiki_plugin_path }}"
+    dest: "{{ ikiwiki_plugin_path }}/{{ item }}"
   loop:
     - copyright.pm
     - htmlscrubber.pm
@@ -45,12 +46,14 @@
 - 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:
diff --git a/wiki/templates/htmlscrubber.pm b/wiki/templates/htmlscrubber.pm
index 904a2dc..bd9ff90 100755
--- a/wiki/templates/htmlscrubber.pm
+++ b/wiki/templates/htmlscrubber.pm
@@ -91,7 +91,7 @@ sub scrubber {
 		}],
 		default => [undef, { (
                              map { $_ => 1 } qw{
-                                 version xmlns x y fill font-size stroke stroke-dasharray transform 
+                                 version xmlns x y fill font-size font-weight stroke stroke-width stroke-dasharray transform 
           data-start data-end data-video data-target data-tracks
               kind label srclang default
 				abbr accept accept-charset accesskey
-- 
cgit v1.2.3