diff --git a/roles/2-common/tasks/fl.yml b/roles/2-common/tasks/fl.yml index 2676d9b3a..30c8266e7 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 }}, 17 in {{ content_base }}" # iiab_base: /opt/iiab file: path: "{{ item }}" # owner: root @@ -12,15 +12,16 @@ - "{{ 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" - #- "{{ content_base }}/working" # /library/working auto-created just below + - "{{ downloads_dir }}" # /opt/iiab/downloads + #- "{{ 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 }}/library/working/rachel" - - "{{ iiab_zim_path }}/content" # /library/zims + - "{{ 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 - "{{ doc_root }}/modules" 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! diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 9f6e9e9fb..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 @@ -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 diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 75e424c17..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 @@ -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 diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 408306a32..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 @@ -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