From 2040142ed2069eea50a3131e571a94f796e8d411 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 17:41:38 -0400 Subject: [PATCH 1/9] 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 60da9ef95a20150636f11c84d668597a869b7a42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 18 Jul 2018 18:07:53 -0400 Subject: [PATCH 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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