diff --git a/roles/kolibri/tasks/apache.yml b/roles/kolibri/tasks/apache.yml.unused similarity index 100% rename from roles/kolibri/tasks/apache.yml rename to roles/kolibri/tasks/apache.yml.unused diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index f4c8ed30e..167c99363 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -9,14 +9,14 @@ system: yes create_home: no -- name: Create directory {{ kolibri_home }} for Kolibri content, configuration, sqlite3 databases ({{ kolibri_user }}:{{ apache_user }}, '0755') +- name: Create directory {{ kolibri_home }} for Kolibri content, configuration, sqlite3 databases ({{ kolibri_user }}:{{ apache_user }}, by default 0755) file: state: directory path: "{{ kolibri_home }}" # /library/kolibri owner: "{{ kolibri_user }}" # kolibri group: "{{ apache_user }}" # www-data (on Debian/Ubuntu/Raspbian) -- name: Create directory /etc/kolibri +- name: Create directory /etc/kolibri (by default 0755) file: state: directory name: /etc/kolibri @@ -44,12 +44,6 @@ src: kolibri.service.j2 dest: /etc/systemd/system/kolibri.service -- name: 'Install from template: /etc/{{ apache_conf_dir }}/kolibri.conf' - template: - src: kolibri.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/kolibri.conf" # apache2/sites-available - when: apache_installed is defined - - name: Stop 'kolibri' systemd service, for Kolibri provisioning (after daemon_reload) systemd: name: kolibri diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 7b006836e..aebecece9 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -44,13 +44,8 @@ state: stopped when: not kolibri_enabled -- name: Enable/Disable/Restart Apache if primary - include_tasks: apache.yml - when: not nginx_enabled - -- name: Enable/Disable/Restart NGINX if primary +- name: Enable/Disable/Restart NGINX include_tasks: nginx.yml - when: nginx_enabled - name: Add 'kolibri' variable values to {{ iiab_ini_file }} # /etc/iiab/iiab.ini diff --git a/roles/kolibri/templates/kolibri.conf.j2 b/roles/kolibri/templates/kolibri.conf.j2.unused similarity index 100% rename from roles/kolibri/templates/kolibri.conf.j2 rename to roles/kolibri/templates/kolibri.conf.j2.unused diff --git a/roles/nginx/README.md b/roles/nginx/README.md index e3274f782..df3e7e97d 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -18,6 +18,7 @@ * captiveportal * IIAB documentation (http://box/info) * jupyterhub + * kolibri * lokole * moodle * nextcloud @@ -32,7 +33,6 @@ * calibre-web * gitea * kiwix - * kolibri * mediawiki * munin * sugarizer