1 files changed, 32 insertions, 3 deletions

diff --git a/roles/wiki/tasks/main.yml b/roles/wiki/tasks/main.yml
index 718b433..9d436a9 100644
--- a/roles/wiki/tasks/main.yml
+++ b/roles/wiki/tasks/main.yml
@@ -1,46 +1,49 @@
 - name: Install ikiwiki
   apt: pkg={{ packages }}
   vars:
     packages:
     - ikiwiki
     - libauthen-passphrase-perl
     - highlight-common
     - libhighlight-perl
     - libimage-magick-perl
     - libmail-sendmail-perl
     - libnet-dns-sec-perl
     - fcgiwrap
     - pandoc
 
+- name: Stop and disable fcgiwrap socket
+  service: name=fcgiwrap.socket state=stopped enabled=false
+
+- name: Stop fcgiwrap service
+  service: name=fcgiwrap.service state=stopped
+
 - name: Create a user 'ikiwiki'
   user: name=ikiwiki system=yes
         home=/var/lib/ikiwiki
         shell=/usr/sbin/nologin
         password=!
         state=present
         generate_ssh_key=yes
         ssh_key_comment=ikiwiki@{{ ansible_fqdn }}
 
-- name: Add 'www-data' to the group 'ikiwiki'
-  user: name=www-data groups=ikiwiki append=yes
-
 - name: Create directory ~ikiwiki/IkiWiki/Plugin
   file: path=/var/lib/ikiwiki/IkiWiki/Plugin
         state=directory
         owner=ikiwiki group=ikiwiki
         mode=0755
 
 - name: Copy ikiwiki plugins
   copy: src=var/lib/ikiwiki/IkiWiki/Plugin/{{ item }}.pm
         dest=/var/lib/ikiwiki/IkiWiki/Plugin/{{ item }}.pm
         owner=root group=root
         mode=0644
   with_items:
     - isWebsite
     - pandoc
   notify:
     - Refresh ikiwiki
 
 # Add the ikiwiki git wrapper as a post-update hook in the git repos in
 # gitolite: "config hook.ikiwiki-wrapper = /var/lib/ikiwiki/wiki.fripost.org"
 # where the 'git_wrapper' can be found in
@@ -53,40 +56,66 @@
 #   ## Add ikiwiki's key to gitolite
 #   ## Create post-update hook, cf. http://rtime.felk.cvut.cz/~sojka/blog/using-ikiwiki-with-gitolite/
 #   $ /usr/bin/sudo -u ikiwiki git clone ssh://gitolite@localhost/fripost-wiki.git
 
 - name: Configure ikiwiki
   copy: src=var/lib/ikiwiki/fripost-wiki.setup
         dest=/var/lib/ikiwiki/fripost-wiki.setup
         owner=root group=root
         mode=0644
   notify:
     - Refresh ikiwiki
 
 - name: Add fripost-wiki to /etc/ikiwiki/wikilist
   lineinfile: dest=/etc/ikiwiki/wikilist
               line='ikiwiki /var/lib/ikiwiki/fripost-wiki.setup'
               owner=root group=root
               mode=0644
 
 - meta: flush_handlers
 
+- name: Copy ikiwiki service unit
+  copy: src=etc/systemd/system/ikiwiki.service
+        dest=/etc/systemd/system/ikiwiki.service
+        owner=root group=root
+        mode=0644
+  notify:
+    - systemctl daemon-reload
+    - Stop ikiwiki
+
+- name: Copy ikiwiki socket unit
+  copy: src=etc/systemd/system/ikiwiki.socket
+        dest=/etc/systemd/system/ikiwiki.socket
+        owner=root group=root
+        mode=0644
+  notify:
+    - systemctl daemon-reload
+    - Restart ikiwiki
+
+- name: Disable ikiwiki service
+  service: name=ikiwiki.service enabled=false
+
+- name: Start ikiwiki socket
+  service: name=ikiwiki.socket state=started enabled=true
+
+- meta: flush_handlers
+
 - name: Copy /etc/nginx/sites-available/{wiki,website}
   copy: src=etc/nginx/sites-available/{{ item }}
         dest=/etc/nginx/sites-available/{{ item }}
         owner=root group=root
         mode=0644
   register: r1
   with_items:
     - website
     - wiki
   notify:
     - Restart Nginx
 
 - name: Create /etc/nginx/sites-enabled/{wiki,website}
   file: src=../sites-available/{{ item }}
         dest=/etc/nginx/sites-enabled/{{ item }}
         owner=root group=root
         state=link force=yes
   register: r2
   with_items:
     - website