summaryrefslogtreecommitdiffstats
path: root/roles/wiki
diff options
context:
space:
mode:
Diffstat (limited to 'roles/wiki')
-rw-r--r--roles/wiki/tasks/docker.yml6
-rw-r--r--roles/wiki/tasks/main.yml5
-rwxr-xr-xroles/wiki/templates/htmlscrubber.pm2
3 files changed, 10 insertions, 3 deletions
diff --git a/roles/wiki/tasks/docker.yml b/roles/wiki/tasks/docker.yml
index a5d73e2..1a759a4 100644
--- a/roles/wiki/tasks/docker.yml
+++ b/roles/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/roles/wiki/tasks/main.yml b/roles/wiki/tasks/main.yml
index 0fa2336..35c297d 100644
--- a/roles/wiki/tasks/main.yml
+++ b/roles/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/roles/wiki/templates/htmlscrubber.pm b/roles/wiki/templates/htmlscrubber.pm
index 904a2dc..bd9ff90 100755
--- a/roles/wiki/templates/htmlscrubber.pm
+++ b/roles/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