From 4c64423f16f285342ba2e041f1bb8f1be773c149 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 7 Aug 2018 18:05:11 -0400 Subject: [PATCH] remove unneeded directives the Readme is left for others. --- roles/kiwix/defaults/main.yml | 3 ++- roles/kiwix/templates/kiwix.conf.j2 | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index d11d8207d..c6334b8dd 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -16,7 +16,8 @@ kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz" kiwix_port: 3000 # Used for Kiwix proxy http://box/kiwix/ -kiwix_url: /kiwix +kiwix_url: /kiwix/ +kiwix_alias_url: /kiwix kiwix_path: "{{ iiab_base }}/kiwix" # /library/zims contains 3 important things: diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index 59cd3cb7c..641c86193 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1,6 +1,4 @@ -ProxyPreserveHost On -ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} -ProxyPassReverse {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} - RewriteEngine on -RewriteRule ^/kiwix$ /kiwix/ [R] +RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] + +ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }}