Merge branch 'master' into daemon-reload

roles/kolibri/tasks/main.yml

@@ -2,8 +2,8 @@
   user:
     name: "{{ kolibri_user }}"
     groups:
-     - "{{ apache_user }}"
-     - disk
+      - "{{ apache_user }}"
+      - disk
     state: present
     shell: /bin/false
     system: yes
@@ -17,7 +17,7 @@
     mode: 0755
     state: directory
   with_items:
-  - "{{ kolibri_home }}"
+    - "{{ kolibri_home }}"
 
 - name: Install kolibri using pip on all OS's
   pip:
@@ -63,20 +63,16 @@
 
 - name: Enable kolibri service
   service:
-    name: "{{ item.name }}"
+    name: kolibri
     enabled: yes
     state: restarted
-  with_items:
-    - { name: kolibri }
   when: kolibri_enabled
 
 - name: Disable kolibri service
   service:
-    name: "{{ item.name }}"
+    name: kolibri
     enabled: no
     state: stopped
-  with_items:
-    - { name: kolibri }
   when: not kolibri_enabled
 
 - name: Add 'kolibri' to list of services at /etc/iiab/iiab.ini