From 8001b18660ef301055badd8db1576e1af6eaf2a3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Feb 2020 01:56:14 -0500 Subject: [PATCH 1/4] Try to add http://box/libros, http://box/livres (Calibre-Web) --- .../templates/calibre-web-nginx.conf.j2 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 index dd9d1d912..0206b2c46 100644 --- a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 +++ b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 @@ -1,4 +1,3 @@ -# TO DO: restore http://box/libros & http://box/livres etc, alongside English (#2195) # RELATED: https://github.com/janeczku/calibre-web/wiki/Setup-Reverse-Proxy location {{ calibreweb_url1 }}/ { @@ -8,3 +7,19 @@ location {{ calibreweb_url1 }}/ { proxy_set_header X-Script-Name {{ calibreweb_url1 }}; proxy_pass http://127.0.0.1:8083; } + +location {{ calibreweb_url2 }}/ { + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name {{ calibreweb_url2 }}; + proxy_pass http://127.0.0.1:8083; +} + +location {{ calibreweb_url3 }}/ { + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name {{ calibreweb_url3 }}; + proxy_pass http://127.0.0.1:8083; +} From 936acdc099445bf36c60b12d7726d5536fd9baf6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Feb 2020 02:02:48 -0500 Subject: [PATCH 2/4] Update calibre-web-nginx.conf.j2 --- roles/calibre-web/templates/calibre-web-nginx.conf.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 index 0206b2c46..d1f2da25b 100644 --- a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 +++ b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 @@ -1,5 +1,6 @@ # RELATED: https://github.com/janeczku/calibre-web/wiki/Setup-Reverse-Proxy +# http://box/books location {{ calibreweb_url1 }}/ { proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -8,6 +9,7 @@ location {{ calibreweb_url1 }}/ { proxy_pass http://127.0.0.1:8083; } +# http://box/libros location {{ calibreweb_url2 }}/ { proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -16,6 +18,7 @@ location {{ calibreweb_url2 }}/ { proxy_pass http://127.0.0.1:8083; } +# http://box/livres location {{ calibreweb_url3 }}/ { proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From a935e9573b1ec0d681ccc5338c3f232b5ef2e5d0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Feb 2020 03:10:14 -0500 Subject: [PATCH 3/4] Update roles/nginx/README.md --- roles/nginx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 90999d07f..51263f2c5 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -10,7 +10,7 @@ 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state of IIAB App/Service migrations as of 2020-02-04: +3. Current state of IIAB App/Service migrations as of 2020-02-14: 1. These support "Native" NGINX but ***NOT*** Apache * Admin Console @@ -46,4 +46,4 @@ * openvpn [*] * pbx -[*] Apache, NGINX and the 7 starred roles above could use improvement as of 2020-02-04. \ No newline at end of file +[*] Apache, NGINX and the 5 above starred roles above could use improvement as of 2020-02-14. From fd26d794fa83bdc2f6c426fd42df8d8288c4e4a3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 14 Feb 2020 03:12:49 -0500 Subject: [PATCH 4/4] Update roles/nginx/README.md --- roles/nginx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 51263f2c5..5bf1eea0c 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -44,6 +44,6 @@ * kalite (menu goes directly to ports 8006-8008) [*] * minetest [*] * openvpn [*] - * pbx + * pbx [*] -[*] Apache, NGINX and the 5 above starred roles above could use improvement as of 2020-02-14. +[*] The 6 above starred roles could use improvement, as of 2020-02-14.