diff --git a/roles/dokuwiki/tasks/install.yml b/roles/dokuwiki/tasks/install.yml
index 815a23d9e..00814cb08 100644
--- a/roles/dokuwiki/tasks/install.yml
+++ b/roles/dokuwiki/tasks/install.yml
@@ -1,31 +1,48 @@
 - name: Get the DokuWiki software
-  get_url: url="{{ iiab_download_url }}/{{ dokuwiki_version }}.tgz"  dest={{ downloads_dir }}/
+  get_url:
+    url: "{{ iiab_download_url }}/{{ dokuwiki_version }}.tgz"
+    dest: "{{ downloads_dir }}/"
+    timeout: "{{ download_timeout }}"
   when: internet_available
 
 - name: Copy it to permanent location /library
-  unarchive: src={{ downloads_dir }}/{{ dokuwiki_version }}.tgz  dest=/library creates=/library/{{ dokuwiki_version }}/VERSION
+  unarchive:
+    src: "{{ downloads_dir }}/{{ dokuwiki_version }}.tgz"
+    dest: /library
+    creates: "/library/{{ dokuwiki_version }}/VERSION"
 
 - name: Symlink /library/dokuwiki* to /library/dokuwiki
   shell: if [ ! -d /library/dokuwiki ]; then ln -sf /library/{{ dokuwiki_version }} /library/dokuwiki; fi
 
 - name: Install config file for DokuWiki in Apache
-  template: src=dokuwiki.conf.j2 dest=/etc/{{ apache_config_dir }}/dokuwiki.conf
+  template:
+    src: dokuwiki.conf.j2
+    dest: "/etc/{{ apache_config_dir }}/dokuwiki.conf"
   when: dokuwiki_enabled
 
-- name: Enable the DokuWiki
-  file: path=/etc/apache2/sites-enabled/dokuwiki.conf
-        src=/etc/apache2/sites-available/dokuwiki.conf
-        state=link
+- name: Enable the DokuWiki (debuntu)
+  file:
+    src: /etc/apache2/sites-available/dokuwiki.conf
+    dest: /etc/apache2/sites-enabled/dokuwiki.conf
+    state: link
   when: dokuwiki_enabled and is_debuntu
 
-- name: Disable the DokuWiki
-  file: path=/etc/apache2/sites-enabled/dokuwiki.conf
-        state=absent
+- name: Disable the DokuWiki (debuntu)
+  file:
+    path: /etc/apache2/sites-enabled/dokuwiki.conf
+    state: absent
   when: not dokuwiki_enabled and is_debuntu
 
 
 - name: Change permissions on engine directory so Apache can write
-  file: path=/library/{{ dokuwiki_version }} owner={{ apache_user }} mode=0755 state=directory recurse=yes
+  file:
+    path: "/library/{{ dokuwiki_version }}"
+    owner: "{{ apache_user }}"
+    mode: 0755
+    state: directory
+    recurse: yes
 
 - name: Restart Apache, so it picks up the new aliases
-  service: name={{ apache_service }} state=restarted
+  service:
+    name: "{{ apache_service }}"
+    state: restarted