From 2f31228a6f5d200753985f0cc1dadfa5c5de64b8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:19:18 -0400 Subject: [PATCH 1/8] Update main.yml --- roles/kolibri/tasks/main.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index d2921a38a..3188acaad 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -17,7 +17,7 @@ mode: 0755 state: directory with_items: - - "{{ kolibri_home }}" + - "{{ kolibri_home }}" - name: Install kolibri using pip on all OS's pip: @@ -59,20 +59,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 From 231717c1f315277b04704b3b49f99737dfd31b57 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:23:07 -0400 Subject: [PATCH 2/8] Update main.yml --- roles/kolibri/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 3188acaad..7e2580ceb 100644 --- a/roles/kolibri/tasks/main.yml +++ b/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 @@ -34,7 +34,7 @@ owner: root group: root with_items: - - { src: 'kolibri.service.j2' , dest: '/etc/systemd/system/kolibri.service', mode: '0644' } + - { src: 'kolibri.service.j2', dest: '/etc/systemd/system/kolibri.service', mode: '0644' } - name: Set kolibri default language shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}" From bed75d8c453ff48b81d884a71de90c6610de99d6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:51:39 -0400 Subject: [PATCH 3/8] Update udev.yml --- roles/2-common/tasks/udev.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index c5ed659a1..d6b58eed4 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -26,6 +26,12 @@ shell: systemctl daemon-reload when: udev_unit.stat.exists is defined and udev_unit.stat.exists +# ubuntu 16.04 comes with ansible 2.0.0.2 -- no systemd module +- name: Ask systemd to recognize the changes (daemon-reloard) + systemd: + daemon_reload: yes + when: udev_unit.stat.exists is defined and udev_unit.stat.exists + - name: Restart so systemd recognizes the changes shell: systemctl restart systemd-udevd.service when: udev_unit.stat.exists is defined and udev_unit.stat.exists From eb11d85ad48cc83d4980221876da28c3cfa4dd17 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:53:19 -0400 Subject: [PATCH 4/8] Update main.yml --- roles/kalite/tasks/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 1cbbdfa5a..06201da87 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -23,8 +23,9 @@ - include_tasks: install.yml when: kalite_installed is defined and not kalite_installed.stat.exists and not is_F18 -- name: Ask systemd to reread the unit files - shell: systemctl daemon-reload +- name: Ask systemd to reread the unit files (daemon-reload) + systemd: + daemon_reload: yes when: not kalite_installed.stat.exists - include_tasks: setup-f18.yml From 25ab293776c8251879a72ce0d8ae1b3b2422fdf0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:54:20 -0400 Subject: [PATCH 5/8] Update udev.yml --- roles/2-common/tasks/udev.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index d6b58eed4..2944518ec 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -22,12 +22,7 @@ when: udev_unit.stat.exists is defined and udev_unit.stat.exists # ubuntu 16.04 comes with ansible 2.0.0.2 -- no systemd module -- name: Ask systemd to recognize the changes - shell: systemctl daemon-reload - when: udev_unit.stat.exists is defined and udev_unit.stat.exists - -# ubuntu 16.04 comes with ansible 2.0.0.2 -- no systemd module -- name: Ask systemd to recognize the changes (daemon-reloard) +- name: Ask systemd to reread the unit files (daemon-reload) systemd: daemon_reload: yes when: udev_unit.stat.exists is defined and udev_unit.stat.exists From ee92bbb54f6f2c7885a8a7f855a85e8e07e7864f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:56:23 -0400 Subject: [PATCH 6/8] Update main.yml --- roles/kalite/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 06201da87..6f8908d86 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -23,7 +23,7 @@ - include_tasks: install.yml when: kalite_installed is defined and not kalite_installed.stat.exists and not is_F18 -- name: Ask systemd to reread the unit files (daemon-reload) +- name: Ask systemd to reread unit files (daemon-reload) systemd: daemon_reload: yes when: not kalite_installed.stat.exists From abbd80c5fd7f9c2169c11b39ea70db40e35e767e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:56:42 -0400 Subject: [PATCH 7/8] Update udev.yml --- roles/2-common/tasks/udev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/udev.yml b/roles/2-common/tasks/udev.yml index 2944518ec..293280d6c 100644 --- a/roles/2-common/tasks/udev.yml +++ b/roles/2-common/tasks/udev.yml @@ -22,7 +22,7 @@ when: udev_unit.stat.exists is defined and udev_unit.stat.exists # ubuntu 16.04 comes with ansible 2.0.0.2 -- no systemd module -- name: Ask systemd to reread the unit files (daemon-reload) +- name: Ask systemd to reread unit files (daemon-reload) systemd: daemon_reload: yes when: udev_unit.stat.exists is defined and udev_unit.stat.exists From 787ac3bbe9af5ab4907c2db4650b65da42e48348 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 16:57:11 -0400 Subject: [PATCH 8/8] Update main.yml --- roles/kolibri/tasks/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index d2921a38a..6e43cc631 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -26,7 +26,7 @@ extra_args: --no-cache-dir when: internet_available -- name: Create kolibri systemd service file +- name: Create kolibri systemd service unit file template: src: "{{ item.src }}" dest: "{{ item.dest }}" @@ -34,7 +34,11 @@ owner: root group: root with_items: - - { src: 'kolibri.service.j2' , dest: '/etc/systemd/system/kolibri.service', mode: '0644' } + - { src: 'kolibri.service.j2', dest: '/etc/systemd/system/kolibri.service', mode: '0644' } + +- name: Ask systemd to reread unit files (daemon-reload) + systemd: + daemon_reload: yes - name: Set kolibri default language shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"