From 2040142ed2069eea50a3131e571a94f796e8d411 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 17:41:38 -0400 Subject: [PATCH 01/17] Update main.yml --- roles/httpd/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 848a42fa2..a57c9af64 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -169,6 +169,10 @@ tags: - base +- include_tasks: php-stem.yml + tags: + - base + - name: Place the script to generate homepages template: src: refresh-wiki-docs.sh From 6ab5bf0618e5978bca510165274460f6e953c8d5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 17:49:09 -0400 Subject: [PATCH 02/17] Update main.yml --- roles/homepage/tasks/main.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/roles/homepage/tasks/main.yml b/roles/homepage/tasks/main.yml index 91b570df5..f88503082 100644 --- a/roles/homepage/tasks/main.yml +++ b/roles/homepage/tasks/main.yml @@ -1,16 +1,19 @@ - name: Create home directory - file: path={{ doc_root }}/home - mode=0755 - owner={{ apache_user }} - group={{ apache_user }} - state=directory + file: + path: "{{ doc_root }}/home" + owner: "{{ apache_user }}" + group: "{{ apache_user }}" + mode: 0755 + state: directory - name: Install admin homepage into apache2 - template: src=iiab-homepage.conf - dest=/etc/{{ apache_config_dir }}/iiab-homepage.conf + template: + src: iiab-homepage.conf + dest: "/etc/{{ apache_config_dir }}/iiab-homepage.conf" - name: Enable the home page - file: src=/etc/{{ apache_config_dir }}/iiab-homepage.conf - dest=/etc/apache2/sites-enabled/iiab-homepage.conf - state=link + file: + src: "/etc/{{ apache_config_dir }}/iiab-homepage.conf" + dest: /etc/apache2/sites-enabled/iiab-homepage.conf + state: link when: is_debuntu From 8d64a3b50d75bea57602be1f5fef1d48531c01e6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 17:57:09 -0400 Subject: [PATCH 03/17] Update main.yml --- roles/osm/tasks/main.yml | 155 ++++++++++++++++++++++----------------- 1 file changed, 87 insertions(+), 68 deletions(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index 2789a2dd5..a0d34e321 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -1,6 +1,7 @@ - name: Install OSM required packages - package: name={{ item }} - state=present + package: + name: "{{ item }}" + state: present with_items: - gcc - python-dev @@ -10,8 +11,9 @@ when: is_debuntu - name: Install OSM required packages - package: name={{ item }} - state=present + package: + name: "{{ item }}" + state: present with_items: - python-pip - gcc @@ -23,26 +25,29 @@ # OSM wants a specific version do that first - name: Install Whoosh 2.6 - pip: name=whoosh - virtualenv={{ osm_venv }} - virtualenv_site_packages=no - version=2.6 - extra_args="--no-cache-dir" + pip: + name=whoosh + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no + version: 2.6 + extra_args: "--no-cache-dir" when: internet_available and is_debuntu - name: Install Flask 0.12X - pip: name=Flask - virtualenv={{ osm_venv }} - virtualenv_site_packages=no - version=0.12.4 - extra_args="--no-cache-dir" + pip: + name: Flask + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no + version: 0.12.4 + extra_args: "--no-cache-dir" when: internet_available and is_debuntu - name: Install OSM with dependencies - pip: name={{ item }} - virtualenv={{ osm_venv }} - virtualenv_site_packages=no - extra_args="--no-cache-dir" + pip: + name: "{{ item }}" + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no + extra_args: "--no-cache-dir" with_items: - MarkupSafe - pytz @@ -51,25 +56,28 @@ # OSM wants a specific version do that first - name: Install Whoosh 2.6 - pip: name=whoosh - virtualenv={{ osm_venv }} - virtualenv_site_packages=no - version=2.6 + pip: + name: whoosh + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no + version: 2.6 # extra_args="--no-cache-dir" when: internet_available and not is_debuntu - name: Install Flask 0.12X - pip: name=Flask - virtualenv={{ osm_venv }} - virtualenv_site_packages=no - version=0.12.4 + pip: + name=Flask + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no + version: 0.12.4 # extra_args="--no-cache-dir" when: internet_available and not is_debuntu - name: Install OSM with dependencies - pip: name={{ item }} - virtualenv={{ osm_venv }} - virtualenv_site_packages=no + pip: + name: "{{ item }}" + virtualenv: "{{ osm_venv }}" + virtualenv_site_packages: no # extra_args="--no-cache-dir" with_items: - MarkupSafe @@ -79,79 +87,90 @@ - name: Set osm_path set_fact: - osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" + osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" when: osm_enabled and is_redhat - name: Set osm_path set_fact: - osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" + osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" when: osm_enabled and is_debuntu - name: Point wsgi to virtual environment (all OS's) - lineinfile: dest={{ osm_venv }}/bin/iiab.wsgi - regexp="path_to_virtualenv = None" - line="path_to_virtualenv = '/usr/local/osm'" - state=present + lineinfile: + dest: "{{ osm_venv }}/bin/iiab.wsgi" + regexp: "path_to_virtualenv = None" + line: "path_to_virtualenv = '/usr/local/osm'" + state: present - name: Copy OSM config file (all OS's) - template: backup=no - src=osm.conf.j2 - dest=/etc/{{ apache_config_dir }}/osm.conf - owner=root - group=root - mode=0644 + template: + src: osm.conf.j2 + dest: "/etc/{{ apache_config_dir }}/osm.conf" + owner: root + group: root + mode: 0644 + backup: no when: osm_enabled - name: Create a link from sites-enabled to sites-available (debuntu) - file: src=/etc/{{ apache_config_dir }}/osm.conf - dest=/etc/apache2/sites-enabled/osm.conf - state=link + file: + src: "/etc/{{ apache_config_dir }}/osm.conf" + dest: /etc/apache2/sites-enabled/osm.conf + state: link when: osm_enabled and is_debuntu - name: Remove the link from sites-enabled to sites-available (debuntu) - file: dest=/etc/apache2/sites-enabled/osm.conf - state=absent + file: + dest: /etc/apache2/sites-enabled/osm.conf + state: absent when: not osm_enabled and is_debuntu - name: Remove the osm.conf (redhat) - file: dest=/{{ apache_config_dir }}/osm.conf - state=absent + file: + dest: "/{{ apache_config_dir }}/osm.conf" + state: absent when: not osm_enabled and is_redhat - name: Remove link to cgi (all OS's) - file: dest={{ doc_root }}/osm.wsgi - state=absent + file: + dest: "{{ doc_root }}/osm.wsgi" + state: absent when: not osm_enabled - name: Create link to cgi (all OS's) - file: src={{ osm_venv }}/bin/iiab.wsgi - dest={{ doc_root }}/osm.wsgi - owner=root - group=root - state=link + file: + src: "{{ osm_venv }}/bin/iiab.wsgi" + dest: "{{ doc_root }}/osm.wsgi" + owner: root + group: root + state: link when: osm_enabled - name: Create the knowledge data set folders - file: path=/library/knowledge/modules - state=directory - owner={{ apache_user }} - group={{ apache_user }} + file: + path: /library/knowledge/modules + state: directory + owner: "{{ apache_user }}" + group: "{{ apache_user }}" # the following was brought into OSM playbook from iiab-factory osm-fix script - name: Copy the files - template: src={{ item.src }} dest={{ item.dest }} + template: + src: "{{ item.src }}" + dest: "{{ item.dest }}" with_items: - - { src: 'defaults.ini', dest: "{{ osm_path }}/" } - - { src: 'etc.iiab.conf', dest: '/etc/iiab.conf' } - - { src: 'map_search.py', dest: "{{ osm_path }}/map_search.py" } - - { src: 'map.html', dest: "{{ osm_path }}/static/map.html" } - - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" } - - { src: '{{ osm_path }}/static/map.html', dest: "{{ osm_path }}/static/index.html" } + - { src: 'defaults.ini', dest: "{{ osm_path }}/" } + - { src: 'etc.iiab.conf', dest: '/etc/iiab.conf' } + - { src: 'map_search.py', dest: "{{ osm_path }}/map_search.py" } + - { src: 'map.html', dest: "{{ osm_path }}/static/map.html" } + - { src: 'l.control.geosearch.js', dest: "{{ osm_path }}/static/lib/leaflet/geosearch/l.control.geosearch.js" } + - { src: "{{ osm_path }}/static/map.html", dest: "{{ osm_path }}/static/index.html" } when: osm_enabled - name: Restart httpd service - service: name={{ apache_service }} - state=restarted + service: + name: "{{ apache_service }}" + state: restarted - name: Add 'osm' to list of services at /etc/iiab/iiab.ini ini_file: From 5f13a94858c8278823525875a70d0f75925262b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:02:55 -0400 Subject: [PATCH 04/17] Update main.yml --- roles/osm/tasks/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a0d34e321..a9ed97c62 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Install OSM required packages +- name: Install OSM required packages (debuntu) package: name: "{{ item }}" state: present @@ -10,7 +10,7 @@ - libapache2-mod-xsendfile when: is_debuntu -- name: Install OSM required packages +- name: Install OSM required packages (not debuntu) package: name: "{{ item }}" state: present @@ -24,16 +24,16 @@ when: not is_debuntu # OSM wants a specific version do that first -- name: Install Whoosh 2.6 +- name: Install Whoosh 2.6 (debuntu) pip: - name=whoosh + name: whoosh virtualenv: "{{ osm_venv }}" virtualenv_site_packages: no version: 2.6 extra_args: "--no-cache-dir" when: internet_available and is_debuntu -- name: Install Flask 0.12X +- name: Install Flask 0.12X (debuntu) pip: name: Flask virtualenv: "{{ osm_venv }}" @@ -42,7 +42,7 @@ extra_args: "--no-cache-dir" when: internet_available and is_debuntu -- name: Install OSM with dependencies +- name: Install OSM with dependencies (debuntu) pip: name: "{{ item }}" virtualenv: "{{ osm_venv }}" @@ -55,7 +55,7 @@ when: internet_available and is_debuntu # OSM wants a specific version do that first -- name: Install Whoosh 2.6 +- name: Install Whoosh 2.6 (not debuntu) pip: name: whoosh virtualenv: "{{ osm_venv }}" @@ -64,16 +64,16 @@ # extra_args="--no-cache-dir" when: internet_available and not is_debuntu -- name: Install Flask 0.12X +- name: Install Flask 0.12X (not debuntu) pip: - name=Flask + name: Flask virtualenv: "{{ osm_venv }}" virtualenv_site_packages: no version: 0.12.4 # extra_args="--no-cache-dir" when: internet_available and not is_debuntu -- name: Install OSM with dependencies +- name: Install OSM with dependencies (not debuntu) pip: name: "{{ item }}" virtualenv: "{{ osm_venv }}" @@ -85,12 +85,12 @@ - Internet-in-a-Box when: internet_available and not is_debuntu -- name: Set osm_path +- name: Set osm_path (redhat) set_fact: osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" when: osm_enabled and is_redhat -- name: Set osm_path +- name: Set osm_path (debuntu) set_fact: osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" when: osm_enabled and is_debuntu From 60da9ef95a20150636f11c84d668597a869b7a42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:07:53 -0400 Subject: [PATCH 05/17] Update main.yml --- roles/httpd/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index a57c9af64..2980760da 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -169,6 +169,7 @@ tags: - base +# So search works @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 - include_tasks: php-stem.yml tags: - base From 7e9817679744203b9d8e9af0c131da6794c5e543 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:17:33 -0400 Subject: [PATCH 06/17] Create php-stem.yml --- roles/httpd/tasks/php-stem.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 roles/httpd/tasks/php-stem.yml diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml new file mode 100644 index 000000000..782df336e --- /dev/null +++ b/roles/httpd/tasks/php-stem.yml @@ -0,0 +1,28 @@ +# Fixes search @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 + +#- name: Download php-stem.rpi.tar +# command: cd /; wget http://download.iiab.io/packages/php-stem.rpi.tar +# when: is_rpi + +#- name: Download php-stem.x86.tar +# command: cd /; wget http://download.iiab.io/packages/php-stem.x64.tar +# when: not is_rpi + +- name: Download & unpack php-stem.rpi.tar to / (rpi) + unarchive: + src: http://download.iiab.io/packages/php-stem.rpi.tar + dest: / + remote_src: yes + when: is_rpi + +- name: Download & unpack php-stem.x86.tar to / (not rpi) + unarchive: + src: http://download.iiab.io/packages/php-stem.x64.tar + dest: / + remote_src: yes + when: not is_rpi + +- name: Restart Apache + service: + name: "{{ apache_service }}" + state: restarted From 95c46292f02337328b88c3bbd299645325faf3b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:18:17 -0400 Subject: [PATCH 07/17] 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 2980760da..97417971d 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -169,7 +169,7 @@ tags: - base -# So search works @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 +# Fixes search @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 - include_tasks: php-stem.yml tags: - base From 8bd3ee999c26682495834dca25ed287e3c38ea18 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:26:36 -0400 Subject: [PATCH 08/17] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 782df336e..115b4ece5 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -1,4 +1,7 @@ -# Fixes search @ http://box/modules/es-wikihow - see https://github.com/iiab/iiab/issues/829 +# Fixes search @ http://box/modules/es-wikihow (popular with Spanish youth) +# Source code: http://download.iiab.io/packages/php-stem.src.tar +# June 2018 debugging & compilation thanks to Tim Moody & George Hunt +# Original bug: https://github.com/iiab/iiab/issues/829 #- name: Download php-stem.rpi.tar # command: cd /; wget http://download.iiab.io/packages/php-stem.rpi.tar @@ -12,6 +15,9 @@ unarchive: src: http://download.iiab.io/packages/php-stem.rpi.tar dest: / + owner: root + group: root + #mode: ???? remote_src: yes when: is_rpi @@ -19,6 +25,9 @@ unarchive: src: http://download.iiab.io/packages/php-stem.x64.tar dest: / + owner: root + group: root + #mode: ???? remote_src: yes when: not is_rpi From 1459e6963b6b935286c40c03f67f1378b344cca1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:31:35 -0400 Subject: [PATCH 09/17] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 115b4ece5..2b2a8891a 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -31,7 +31,7 @@ remote_src: yes when: not is_rpi -- name: Restart Apache +- name: Restart apache2 / httpd service: name: "{{ apache_service }}" state: restarted From e52b8e5625aa3266a04eab5723684a3efc210a0e Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:37:47 -0400 Subject: [PATCH 10/17] 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 97417971d..a62c9b955 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -174,7 +174,7 @@ tags: - base -- name: Place the script to generate homepages +- name: Install /usr/bin/refresh-wiki-docs.sh (scraper script) to create http://box/info offline documentation template: src: refresh-wiki-docs.sh dest: /usr/bin/iiab-refresh-wiki-docs From 0d64c88dd0a9cab23206a0307dc8169b5e1c9f61 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:42:16 -0400 Subject: [PATCH 11/17] No need to restart Aoache twice --- roles/httpd/tasks/php-stem.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 2b2a8891a..191872775 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -31,7 +31,8 @@ remote_src: yes when: not is_rpi -- name: Restart apache2 / httpd - service: - name: "{{ apache_service }}" - state: restarted +# No need to do this twice? Happens later @ https://github.com/iiab/iiab/blob/master/roles/3-base-server/tasks/main.yml#L24-L28 +#- name: Restart apache2 / httpd +# service: +# name: "{{ apache_service }}" +# state: restarted From 91a325a5b7782485fade4b72205eb2bc9ea9f656 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:58:51 -0400 Subject: [PATCH 12/17] 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 a62c9b955..95c36bf0f 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -174,7 +174,7 @@ tags: - base -- name: Install /usr/bin/refresh-wiki-docs.sh (scraper script) to create http://box/info offline documentation +- name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation template: src: refresh-wiki-docs.sh dest: /usr/bin/iiab-refresh-wiki-docs From bd6324fe22fafce7f2db62359be167873ded0cd9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 19:42:53 -0400 Subject: [PATCH 13/17] Update ansible --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index 8afc057de..666485305 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -2,7 +2,7 @@ echo -e '\n\nSTRONGLY RECOMMENDED PREREQUISITE: (1) remove all prior versions of Ansible using "apt purge ansible" and/or "pip uninstall ansible" and (2) clear out all lines containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n' -echo -e 'WARNING: repeatedly re-run "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367" if this part of the script fails due to network/mirror.\n' +echo -e 'WARNING: repeatedly re-run "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367" if this part of the script fails due to network/mirrors.\n' echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n' From db7d956324528f76e49c22b7ba47042eccdfd3b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 19:43:11 -0400 Subject: [PATCH 14/17] Update ansible-2.6.x --- scripts/ansible-2.6.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.6.x b/scripts/ansible-2.6.x index 6e9c76daf..f8cf8b077 100755 --- a/scripts/ansible-2.6.x +++ b/scripts/ansible-2.6.x @@ -2,7 +2,7 @@ echo -e '\n\nSTRONGLY RECOMMENDED PREREQUISITE: (1) remove all prior versions of Ansible using "apt purge ansible" and/or "pip uninstall ansible" and (2) clear out all lines containing ansible from /etc/apt/sources.list and /etc/apt/sources.list.d/*\n' -echo -e 'WARNING: repeatedly re-run "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367" if this part of the script fails due to network/mirror.\n' +echo -e 'WARNING: repeatedly re-run "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367" if this part of the script fails due to network/mirrors.\n' echo -e 'COMPLETE INSTALL INSTRUCTIONS:\nhttps://github.com/iiab/iiab/wiki/IIAB-Installation#do-everything-from-scratch\n' From d42ac31e104fc564c305f313f2640e5a55482f3b Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 20:34:57 -0400 Subject: [PATCH 15/17] 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 95c36bf0f..ba5543dc5 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -174,7 +174,7 @@ tags: - base -- name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation +- name: Install /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation (will be run at the end of Stage 4 = roles/4-server-options/tasks/main.yml) template: src: refresh-wiki-docs.sh dest: /usr/bin/iiab-refresh-wiki-docs From e6021a1f33eba94a70d5ecc6fda9786b34a513c5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 20:35:43 -0400 Subject: [PATCH 16/17] Update main.yml --- roles/4-server-options/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index edd787d28..fbe551818 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -85,7 +85,7 @@ src: roles/1-prep/templates/iiab_env.py.j2 dest: /etc/iiab/iiab_env.py -- name: Generate the offline documents +- name: Run /usr/bin/iiab-refresh-wiki-docs (scraper script) to create http://box/info offline documentation (script was installed at the beginning of Stage 3 = roles/3-base-server/tasks/main.yml, which runs the HTTPD playbook = roles/httpd/tasks/main.yml) command: /usr/bin/iiab-refresh-wiki-docs when: not nodocs From 2a58b8ec6e563ccb41ff8be1477667207a907494 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 23:25:32 -0400 Subject: [PATCH 17/17] clarified 4 comments --- roles/usb-lib/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/usb-lib/tasks/main.yml b/roles/usb-lib/tasks/main.yml index 1f312b188..e146ecf90 100644 --- a/roles/usb-lib/tasks/main.yml +++ b/roles/usb-lib/tasks/main.yml @@ -26,7 +26,7 @@ - { src: 'iiab-usb-lib-show-all-on' , dest: '/usr/bin/', mode: '0755' } - { src: 'iiab-usb-lib-show-all-off' , dest: '/usr/bin/', mode: '0755' } -- name: Enable exfat and ntfs +- name: Enable exFAT and NTFS lineinfile: regexp: '^FILESYSTEMS.*' line: 'FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus exfat fuseblk ntfs"' @@ -53,7 +53,7 @@ state: absent when: not usb_lib_enabled -- name: Put a variable in iiab.env for display of content at root of USB +- name: Put variable in iiab.env that enables display of content at root of USB lineinfile: dest: /etc/iiab/iiab.env regexp: "^IIAB_USB_LIB_SHOW_ALL.*" @@ -65,14 +65,14 @@ dest: "/etc/{{ apache_config_dir }}" when: usb_lib_enabled -- name: Create the link to enable (debian) +- name: Create the link to enable (debuntu) file: src: "/etc/{{ apache_config_dir }}/content_dir.conf" dest: /etc/apache2/sites-enabled/content_dir.conf state: link when: is_debuntu -- name: Remove the link that enables (debian) +- name: Remove the link that enables (debuntu) file: src: "/etc/{{ apache_config_dir }}/content_dir.conf" dest: /etc/apache2/sites-enabled/content_dir.conf