diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index 082ac8f0e..83a9aec3e 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -9,7 +9,7 @@ system: yes create_home: no -- name: Create directory {{ kolibri_home }} (for Kolibri content, configuration, sqlite3 databases) +- name: Create directory {{ kolibri_home }} for Kolibri content, configuration, sqlite3 databases ({{ kolibri_user }}:{{ apache_user }}, '0755') file: state: directory path: "{{ kolibri_home }}" # /library/kolibri @@ -49,7 +49,7 @@ KOLIBRI_USER: "{{ kolibri_user }}" # both can't hurt & Might Help Later when: internet_available | bool -- name: 'Install from templates: kolibri.service unit file for systemd & sites-available/kolibri.conf for Apache' +- name: 'Install from templates: /etc/systemd/system/kolibri.service & /etc/{{ apache_conf_dir }}/kolibri.conf' template: src: "{{ item.src }}" dest: "{{ item.dest }}" @@ -58,14 +58,12 @@ # mode: '0644' with_items: - { src: 'kolibri.service.j2', dest: '/etc/systemd/system/kolibri.service' } - - { src: 'kolibri.conf.j2', dest: '/etc/apache2/sites-available/kolibri.conf' } + - { src: 'kolibri.conf.j2', dest: '/etc/{{ apache_conf_dir }}/kolibri.conf' } # apache2/sites-available -# - name: Enable 'kolibri' systemd service (for reboots) but ensure it's stopped for Kolibri provisioning - name: Stop 'kolibri' systemd service, for Kolibri provisioning (after daemon_reload) systemd: name: kolibri daemon_reload: yes - # enabled: yes state: stopped