From daaba173f7376ece2beb049d700ab6cf609d50cd Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:32:55 -0400 Subject: [PATCH 1/6] kolibri_url_without_slash: /kolibri --- roles/kolibri/defaults/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/kolibri/defaults/main.yml b/roles/kolibri/defaults/main.yml index 423f012cd..0a1273fa9 100644 --- a/roles/kolibri/defaults/main.yml +++ b/roles/kolibri/defaults/main.yml @@ -12,8 +12,10 @@ # Kolibri folder to store its data and configuration files. kolibri_home: "{{ content_base }}/kolibri" # /library/kolibri -kolibri_url: /kolibri -kolibri_venv_path: /usr/local/kolibri +kolibri_url_without_slash: /kolibri +kolibri_url: "{{ kolibri_url_without_slash }}/" # /kolibri/ + +kolibri_venv_path: /usr/local/kolibri # For /usr/local/kolibri/bin/kolibri # 2018-07-16: IIAB recommends /usr/bin but @arky says this isn't yet possible, due to pip kolibri_exec_path: "{{ kolibri_venv_path }}/bin/kolibri" From 7044dc6b80328dbf7b8bf9ce8c905145acff7a37 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:33:37 -0400 Subject: [PATCH 2/6] Update kolibri.conf.j2 --- roles/kolibri/templates/kolibri.conf.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/kolibri/templates/kolibri.conf.j2 b/roles/kolibri/templates/kolibri.conf.j2 index e8182dc18..933dfb9d9 100644 --- a/roles/kolibri/templates/kolibri.conf.j2 +++ b/roles/kolibri/templates/kolibri.conf.j2 @@ -1,3 +1,6 @@ +# SEE https://github.com/iiab/iiab/blob/master/roles/kiwix/templates/kiwix.conf.j2 +RedirectMatch ^{{ kolibri_url_without_slash }}$ {{ kiwix_url }} + ProxyPreserveHost On ProxyPass {{ kolibri_url }} http://localhost:{{ kolibri_http_port }}{{ kolibri_url }} ProxyPassReverse {{ kolibri_url }} http://localhost:{{ kolibri_http_port }}{{ kolibri_url }} From 94abf4fbd7b36e7eb4dea885ac419474b889df3d Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:36:02 -0400 Subject: [PATCH 3/6] kiwix_url_without_slash: /kiwix --- roles/kiwix/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 0aa22b388..42d9415e3 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -24,8 +24,8 @@ kiwix_src_file_linux64: "{{ kiwix_version_linux64 }}.tar.gz" kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz" # Used for Kiwix proxy http://box/kiwix/ -kiwix_url: /kiwix/ -kiwix_alias_url: /kiwix +kiwix_url_without_slash: /kiwix +kiwix_url: "{{ kiwix_url_without_slash }}/" # /kiwix/ kiwix_path: "{{ iiab_base }}/kiwix" # /opt/iiab # /library/zims contains 3 important things: From e4e0fe0af0cd30c55b4bbb1ecd6fc7ebe152609e Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:37:42 -0400 Subject: [PATCH 4/6] kiwix_alias_url -> kiwix_url_without_slash --- roles/kiwix/templates/kiwix.conf.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index f8d1a5840..63456a586 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1,9 +1,11 @@ +# SEE https://github.com/iiab/iiab/blob/master/roles/kolibri/templates/kolibri.conf.j2 + # 2018-08-31: FAILS to enable http://box/kiwix #RewriteEngine on #RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] # 2018-08-31: SUCCEEDS in enabling http://box/kiwix -RedirectMatch ^{{ kiwix_alias_url }}$ {{ kiwix_url }} +RedirectMatch ^{{ kiwix_url_without_slash }}$ {{ kiwix_url }} # 2018-08-31: SUCCEEDS in enabling http://box/kiwix/ & http://box/kiwix/zim & http://box/kiwix/zim/ #ProxyPreserveHost On From 7287c06dbcf02b78b18e693025747a0e0b2c4c5c Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:38:31 -0400 Subject: [PATCH 5/6] Update kiwix.conf.j2 --- roles/kiwix/templates/kiwix.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index 63456a586..e37f6b517 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -2,7 +2,7 @@ # 2018-08-31: FAILS to enable http://box/kiwix #RewriteEngine on -#RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] +#RewriteRule ^{{ kiwix_url_without_slash }}$ {{ kiwix_url }} [R] # 2018-08-31: SUCCEEDS in enabling http://box/kiwix RedirectMatch ^{{ kiwix_url_without_slash }}$ {{ kiwix_url }} From 11ff7384e971405ae2142e22c5de1d77d46e7b8d Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 27 Sep 2019 14:42:00 -0400 Subject: [PATCH 6/6] Update main.yml --- roles/kiwix/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 42d9415e3..c4453e0a1 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -26,7 +26,7 @@ kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz" # Used for Kiwix proxy http://box/kiwix/ kiwix_url_without_slash: /kiwix kiwix_url: "{{ kiwix_url_without_slash }}/" # /kiwix/ -kiwix_path: "{{ iiab_base }}/kiwix" # /opt/iiab +kiwix_path: "{{ iiab_base }}/kiwix" # /opt/iiab/kiwix # /library/zims contains 3 important things: # - library.xml