From 8a46b11eece3235d5f64b36cd9a9322fad9cc98c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:08:50 -0400 Subject: [PATCH 01/17] Update kolibri.service.j2 --- roles/kolibri/templates/kolibri.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/templates/kolibri.service.j2 b/roles/kolibri/templates/kolibri.service.j2 index ef420c4a1..0b230f7d1 100644 --- a/roles/kolibri/templates/kolibri.service.j2 +++ b/roles/kolibri/templates/kolibri.service.j2 @@ -2,7 +2,7 @@ Description=Kolibri [Service] -Type=oneshot +Type=forking RemainAfterExit=yes Environment=KOLIBRI_USER={{ kolibri_user }} Environment=KOLIBRI_HOME={{ kolibri_home }} From 9c7aaaca7a5f649b77826851af4db8377547fce9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:45:46 -0400 Subject: [PATCH 02/17] Update main.yml --- roles/mongodb/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml index 2553868fb..6b5e4f357 100644 --- a/roles/mongodb/defaults/main.yml +++ b/roles/mongodb/defaults/main.yml @@ -1,2 +1,4 @@ mongodb_install: False mongodb_enabled: False + +mongodb_db_path: {{ content_base }}/dbdata/mongodb # /library/dbdata/mongodb/ From 1a6d3dd8fd574f32feb69601fe8cd7db1d583b49 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:50:52 -0400 Subject: [PATCH 03/17] Update main.yml --- roles/mongodb/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index 5ba9a9d83..edf0fed17 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -16,7 +16,7 @@ owner: mongodb with_items: - { path: '/var/run/mongodb' } - - { path: '/library/dbdata/mongodb' } + - { path: "{{ mongodb_db_path }}" } - { path: '/var/log/mongodb' } - name: Position /etc/mongod.conf and mongodb.service From 4e0fc10017c97c92055c17461478825efb430240 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:51:55 -0400 Subject: [PATCH 04/17] Update mongodb.service --- roles/mongodb/templates/mongodb.service | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service index 40f4f573f..1cfc98b05 100644 --- a/roles/mongodb/templates/mongodb.service +++ b/roles/mongodb/templates/mongodb.service @@ -6,7 +6,9 @@ After=syslog.target network.target Type=simple User=mongodb Group=mongodb +ExecStartPre=/usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} ExecStart=/usr/bin/mongod -f /etc/mongod.conf +ExecStop=/usr/bin/killall mongod [Install] WantedBy=multi-user.target From 77416f4d528104ce443589b7c39e9687062759a4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:55:25 -0400 Subject: [PATCH 05/17] Update main.yml --- roles/mongodb/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index edf0fed17..4bc7653f8 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -19,7 +19,7 @@ - { path: "{{ mongodb_db_path }}" } - { path: '/var/log/mongodb' } -- name: Position /etc/mongod.conf and mongodb.service +- name: Populate & position /etc/mongod.conf, /etc/systemd/system/mongodb.service template: src: "{{ item.src }}" dest: "{{ item.dest }}" @@ -27,8 +27,8 @@ group: root mode: 0644 with_items: - - { src: 'mongodb.service' , dest: '/etc/systemd/system/' } - - { src: 'mongod.conf' , dest: '/etc/mongod.conf'} + - { src: 'mongodb.service.j2' , dest: '/etc/systemd/system/' } + - { src: 'mongod.conf.j2' , dest: '/etc/mongod.conf'} - name: Restart service if enabled service: From 1c3498603d20d07238d1a88b64f75431b86e6d9a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:57:17 -0400 Subject: [PATCH 06/17] Update and rename mongod.conf to mongod.conf.j2 --- roles/mongodb/templates/{mongod.conf => mongod.conf.j2} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename roles/mongodb/templates/{mongod.conf => mongod.conf.j2} (99%) diff --git a/roles/mongodb/templates/mongod.conf b/roles/mongodb/templates/mongod.conf.j2 similarity index 99% rename from roles/mongodb/templates/mongod.conf rename to roles/mongodb/templates/mongod.conf.j2 index 478375a5e..f8b3f1497 100644 --- a/roles/mongodb/templates/mongod.conf +++ b/roles/mongodb/templates/mongod.conf.j2 @@ -21,7 +21,7 @@ logpath = /var/log/mongodb/mongod.log # unixSocketPrefix = /var/run/mongodb # Directory for datafiles (defaults to /data/db/) -dbpath = /library/dbdata/mongodb +dbpath = {{ mongodb_db_path }} # Enable/Disable journaling (journaling is on by default for 64 bit) journal = true @@ -234,4 +234,3 @@ smallfiles = true # Activate FIPS 140-2 mode at startup #sslFIPSMode = true - From 639bb43f92fd6befdb2f151e672480d942578aa5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 12:57:35 -0400 Subject: [PATCH 07/17] Rename mongodb.service to mongodb.service.j2 --- roles/mongodb/templates/{mongodb.service => mongodb.service.j2} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename roles/mongodb/templates/{mongodb.service => mongodb.service.j2} (100%) diff --git a/roles/mongodb/templates/mongodb.service b/roles/mongodb/templates/mongodb.service.j2 similarity index 100% rename from roles/mongodb/templates/mongodb.service rename to roles/mongodb/templates/mongodb.service.j2 From 4cdcda9438b3280cc50a33ab966d36f413085796 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:11:14 -0400 Subject: [PATCH 08/17] Update main.yml --- roles/mongodb/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml index 6b5e4f357..86f699596 100644 --- a/roles/mongodb/defaults/main.yml +++ b/roles/mongodb/defaults/main.yml @@ -2,3 +2,4 @@ mongodb_install: False mongodb_enabled: False mongodb_db_path: {{ content_base }}/dbdata/mongodb # /library/dbdata/mongodb/ +mongodb_conf: /etc/mongod.conf From db9d9be955d11ddffb0e62da46a7416a0594b887 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:12:37 -0400 Subject: [PATCH 09/17] Update main.yml --- roles/mongodb/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index 4bc7653f8..49230c5ac 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -27,8 +27,8 @@ group: root mode: 0644 with_items: - - { src: 'mongodb.service.j2' , dest: '/etc/systemd/system/' } - - { src: 'mongod.conf.j2' , dest: '/etc/mongod.conf'} + - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/' } + - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" } - name: Restart service if enabled service: From b35b612c5281fad1e464fb9682e2e061aa368d1a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:15:04 -0400 Subject: [PATCH 10/17] Update mongodb.service.j2 --- roles/mongodb/templates/mongodb.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/templates/mongodb.service.j2 b/roles/mongodb/templates/mongodb.service.j2 index 1cfc98b05..4407efddc 100644 --- a/roles/mongodb/templates/mongodb.service.j2 +++ b/roles/mongodb/templates/mongodb.service.j2 @@ -7,7 +7,7 @@ Type=simple User=mongodb Group=mongodb ExecStartPre=/usr/bin/mongod --repair --dbpath {{ mongodb_db_path }} -ExecStart=/usr/bin/mongod -f /etc/mongod.conf +ExecStart=/usr/bin/mongod -f {{ mongodb_conf }} ExecStop=/usr/bin/killall mongod [Install] From 21dd6ab03f7ed2b7ee9abe31b548bd7ffc5db90d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:15:52 -0400 Subject: [PATCH 11/17] Update main.yml --- roles/mongodb/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml index 86f699596..5dfc8d4df 100644 --- a/roles/mongodb/defaults/main.yml +++ b/roles/mongodb/defaults/main.yml @@ -1,5 +1,5 @@ mongodb_install: False mongodb_enabled: False -mongodb_db_path: {{ content_base }}/dbdata/mongodb # /library/dbdata/mongodb/ +mongodb_db_path: {{ content_base }}/dbdata/mongodb # == /library/dbdata/mongodb/ mongodb_conf: /etc/mongod.conf From a1a3b4f6778a63777f8e34705fe98509d4e7c565 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:19:40 -0400 Subject: [PATCH 12/17] Update main.yml --- roles/mongodb/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/defaults/main.yml b/roles/mongodb/defaults/main.yml index 5dfc8d4df..6aed9834a 100644 --- a/roles/mongodb/defaults/main.yml +++ b/roles/mongodb/defaults/main.yml @@ -1,5 +1,5 @@ mongodb_install: False mongodb_enabled: False -mongodb_db_path: {{ content_base }}/dbdata/mongodb # == /library/dbdata/mongodb/ +mongodb_db_path: "{{ content_base }}/dbdata/mongodb" # == /library/dbdata/mongodb/ mongodb_conf: /etc/mongod.conf From 0f1346aa8eae2413915b278da2c5b1ce9f881e75 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 13:29:45 -0400 Subject: [PATCH 13/17] Update main.yml --- roles/mongodb/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mongodb/tasks/main.yml b/roles/mongodb/tasks/main.yml index 49230c5ac..0bd2fa5a6 100644 --- a/roles/mongodb/tasks/main.yml +++ b/roles/mongodb/tasks/main.yml @@ -27,7 +27,7 @@ group: root mode: 0644 with_items: - - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/' } + - { src: 'mongodb.service.j2', dest: '/etc/systemd/system/mongodb.service' } - { src: 'mongod.conf.j2', dest: "{{ mongodb_conf }}" } - name: Restart service if enabled From 0a58c34000698b007d135e51c82a9dd8c4a8c296 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 15:06:14 -0400 Subject: [PATCH 14/17] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index 8226ad1ff..adee4c320 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -22,7 +22,7 @@ - php{{ php_version }}-cli when: is_debuntu -- name: php-zip name (debian_9 or ubuntu) +- name: php-zip name (debian-9 or ubuntu) package: name: "php{{ php_version }}-zip" when: is_debian_9 or is_ubuntu From edb0526190d5a870f3dbbc909ef8ded1a2094dae Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 15:07:28 -0400 Subject: [PATCH 15/17] Update main.yml --- roles/moodle/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml index adee4c320..7374ae31e 100644 --- a/roles/moodle/tasks/main.yml +++ b/roles/moodle/tasks/main.yml @@ -27,7 +27,7 @@ name: "php{{ php_version }}-zip" when: is_debian_9 or is_ubuntu -- name: php-zip name for (debian_8) +- name: php-zip name for (debian-8) package: name: php-pclzip when: is_debian_8 From 334f2f22c71ad0ec50a98e2f216950f950667168 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 15:07:39 -0400 Subject: [PATCH 16/17] Update main.yml --- roles/mysql/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index 02f879cd1..3fad2b357 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -19,13 +19,13 @@ tags: - download - - name: php-xml (ubuntu or debian_9) + - name: php-xml (ubuntu or debian-9) package: name: "php{{ php_version }}-xml" state: present when: is_ubuntu or is_debian_9 - - name: php-xml (debian_8) + - name: php-xml (debian-8) package: name: "php-xml-parser" state: present From 50b792869d65114daccfc77ab290b16295e207a2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 17 Jul 2018 15:09:23 -0400 Subject: [PATCH 17/17] Update packages.yml --- roles/2-common/tasks/packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index fdb840965..f64c25936 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -14,14 +14,14 @@ - avahi-tools when: is_redhat -- name: Download usbmount -- not in Debian Stretch (debian_9) +- name: Download usbmount -- not in Debian Stretch (debian-9) get_url: url: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" dest: "{{ downloads_dir }}" timeout: "{{ download_timeout }}" when: internet_available and is_debian_9 -- name: Install usbmount (debian_9) +- name: Install usbmount (debian-9) command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb when: is_debian_9