From bf8b22860592b1a44a3d138689d06fd6d2cab27e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 03:36:16 -0500 Subject: [PATCH 01/10] Update 2-common/tasks/fl.yml --- roles/2-common/tasks/fl.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 2676d9b3a..3a32dcbbc 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,6 +1,6 @@ # fl.yml signifies "file layout" -- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 2 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab +- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" # owner: root @@ -12,14 +12,13 @@ - "{{ py3_dist_path }}/iiab" # /usr/lib/python3/dist-packages - "{{ yum_packages_dir }}" # /opt/iiab/yum-packages - "{{ pip_packages_dir }}" # /opt/iiab/pip-packages - #- "{{ downloads_dir }}" # /library/downloads auto-created just below - - "{{ downloads_dir }}/zims" - - "{{ downloads_dir }}/maps" - #- "{{ downloads_dir }}/rachel" + - "{{ downloads_dir }}" # /opt/iiab/downloads + #- "{{ content_base }}/downloads" # /library/downloads auto-created just below + - "{{ content_base }}/downloads/zims" + - "{{ content_base }}/downloads/maps" #- "{{ content_base }}/working" # /library/working auto-created just below - "{{ content_base }}/working/zims" - "{{ content_base }}/working/maps" - #- "{{ content_base }}/library/working/rachel" - "{{ iiab_zim_path }}/content" # /library/zims - "{{ iiab_zim_path }}/index" - "{{ doc_root }}/local_content" # /library/www/html From 64ed0856e615c96a1b4865de7560db0400331c73 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 03:44:26 -0500 Subject: [PATCH 02/10] Update fl.yml --- roles/2-common/tasks/fl.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 3a32dcbbc..603b93c78 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -1,6 +1,6 @@ # fl.yml signifies "file layout" -- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 15 in {{ content_base }}" # iiab_base: /opt/iiab +- name: "File Layout - Create directories: 1 in /etc, 1 in {{ py3_dist_path }}, 3 in {{ iiab_base }}, 17 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" # owner: root @@ -16,9 +16,11 @@ #- "{{ content_base }}/downloads" # /library/downloads auto-created just below - "{{ content_base }}/downloads/zims" - "{{ content_base }}/downloads/maps" + - "{{ content_base }}/downloads/rachel" # STILL USED OR NOT? #- "{{ content_base }}/working" # /library/working auto-created just below - "{{ content_base }}/working/zims" - "{{ content_base }}/working/maps" + - "{{ content_base }}/working/rachel" # STILL USED OR NOT? - "{{ iiab_zim_path }}/content" # /library/zims - "{{ iiab_zim_path }}/index" - "{{ doc_root }}/local_content" # /library/www/html From c88aaf38c40b7c106a8594e8c10c7666e25578c4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 08:53:06 -0500 Subject: [PATCH 03/10] Update local_vars_min.yml --- vars/local_vars_min.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 408306a32..99602b3af 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -367,22 +367,3 @@ calibreweb_url1: /books # For SHORT URL http://box/books (English) calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - - -# CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: -# -# 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* -# 2018: http://download.iiab.io/content/OSM/vector-tiles/ -# 2017: http://oer2go.org/viewmod/en-worldmap-10 - -# UNMAINTAINED -# authserver_install: False -# authserver_enabled: False - -# UNMAINTAINED -# docker_install: False -# docker_enabled: False - -# UNMAINTAINED -# osm_install: False -# osm_enabled: False From 00eb1c75c738da6dba43ffaac9d1b356a9758af7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 08:53:33 -0500 Subject: [PATCH 04/10] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 75e424c17..f0ebf67f3 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -367,22 +367,3 @@ calibreweb_url1: /books # For SHORT URL http://box/books (English) calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - - -# CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: -# -# 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* -# 2018: http://download.iiab.io/content/OSM/vector-tiles/ -# 2017: http://oer2go.org/viewmod/en-worldmap-10 - -# UNMAINTAINED -# authserver_install: False -# authserver_enabled: False - -# UNMAINTAINED -# docker_install: False -# docker_enabled: False - -# UNMAINTAINED -# osm_install: False -# osm_enabled: False From ee8b892b04726b3bf0be099118c08830c64c2d31 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 08:54:03 -0500 Subject: [PATCH 05/10] Update local_vars_big.yml --- vars/local_vars_big.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 9f6e9e9fb..6267f59b4 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -367,22 +367,3 @@ calibreweb_url1: /books # For SHORT URL http://box/books (English) calibreweb_url2: /libros # For SHORT URL http://box/libros (Spanish) calibreweb_url3: /livres # For SHORT URL http://box/livres (French) calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - - -# CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD: -# -# 2019: https://github.com/iiab/iiab/wiki/IIAB-Maps SEE ABOVE osm_vector_maps_* -# 2018: http://download.iiab.io/content/OSM/vector-tiles/ -# 2017: http://oer2go.org/viewmod/en-worldmap-10 - -# UNMAINTAINED -# authserver_install: False -# authserver_enabled: False - -# UNMAINTAINED -# docker_install: False -# docker_enabled: False - -# UNMAINTAINED -# osm_install: False -# osm_enabled: False From 923e884ad81397c391341d415c6b766d1af4bd70 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 09:10:04 -0500 Subject: [PATCH 06/10] Update local_vars_min.yml --- vars/local_vars_min.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 99602b3af..bbfe4755c 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -206,12 +206,12 @@ azuracast_install: False azuracast_enabled: False # UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 -dokuwiki_install: False -dokuwiki_enabled: False +# dokuwiki_install: False +# dokuwiki_enabled: False # UNMAINTAINED as of November 2019 -ejabberd_install: False -ejabberd_enabled: False +# ejabberd_install: False +# ejabberd_enabled: False elgg_install: False elgg_enabled: False From 47f50666e215c3cdd8c96a66787fa947ba50338c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 09:11:10 -0500 Subject: [PATCH 07/10] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index f0ebf67f3..d3bbf38b4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -206,12 +206,12 @@ azuracast_install: False azuracast_enabled: False # UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 -dokuwiki_install: False -dokuwiki_enabled: False +# dokuwiki_install: False +# dokuwiki_enabled: False # UNMAINTAINED as of November 2019 -ejabberd_install: False -ejabberd_enabled: False +# ejabberd_install: False +# ejabberd_enabled: False elgg_install: False elgg_enabled: False From 0368c4ab0ef2f31e3f2bc87ad2da43c74ded3034 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 09:12:07 -0500 Subject: [PATCH 08/10] Update local_vars_big.yml --- vars/local_vars_big.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 6267f59b4..955c54fe4 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -206,12 +206,12 @@ azuracast_install: False azuracast_enabled: False # UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056 -dokuwiki_install: False -dokuwiki_enabled: False +# dokuwiki_install: False +# dokuwiki_enabled: False # UNMAINTAINED as of November 2019 -ejabberd_install: False -ejabberd_enabled: False +# ejabberd_install: False +# ejabberd_enabled: False elgg_install: True elgg_enabled: True From 9594dd86b0e07b3157f244212bdb5549e0d4a3fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 27 Jan 2020 09:34:57 -0500 Subject: [PATCH 09/10] Update fl.yml --- roles/2-common/tasks/fl.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 603b93c78..30c8266e7 100644 --- a/roles/2-common/tasks/fl.yml +++ b/roles/2-common/tasks/fl.yml @@ -17,11 +17,11 @@ - "{{ content_base }}/downloads/zims" - "{{ content_base }}/downloads/maps" - "{{ content_base }}/downloads/rachel" # STILL USED OR NOT? - #- "{{ content_base }}/working" # /library/working auto-created just below + #- "{{ content_base }}/working" # /library/working auto-created just below - "{{ content_base }}/working/zims" - "{{ content_base }}/working/maps" - "{{ content_base }}/working/rachel" # STILL USED OR NOT? - - "{{ iiab_zim_path }}/content" # /library/zims + - "{{ iiab_zim_path }}/content" # /library/zims - "{{ iiab_zim_path }}/index" - "{{ doc_root }}/local_content" # /library/www/html - "{{ doc_root }}/modules" From 80ea5b74f97f192c5dcecdf2c8ae59c17eb0b1ba Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 28 Jan 2020 05:09:31 -0500 Subject: [PATCH 10/10] Update main.yml --- roles/httpd/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 00bdaf052..945c3e7d4 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -2,7 +2,7 @@ # - Validate input vars apache_install & apache_enabled here. # - Use as nec, with 'when: apache_installed is undefined' # - Encapsulate all 3 tasks below into httpd/roles/install.yml ? -# - Similarly sanity-check httpd/roles/enable.yml... +# - Similarly sanity-check httpd/roles/enable.yml or httpd/roles/enable-or-disable.yml... # - Verify that 9-local-addons/tasks/main.yml's invocation of # roles/httpd/tasks/enable.yml (via roles/httpd-enable/tasks/main.yml, if # apache_enabled is True) does the right thing!