diff --git a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 index dd9d1d912..d1f2da25b 100644 --- a/roles/calibre-web/templates/calibre-web-nginx.conf.j2 +++ b/roles/calibre-web/templates/calibre-web-nginx.conf.j2 @@ -1,6 +1,6 @@ -# TO DO: restore http://box/libros & http://box/livres etc, alongside English (#2195) # 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,3 +8,21 @@ location {{ calibreweb_url1 }}/ { proxy_set_header X-Script-Name {{ 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; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name {{ 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; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name {{ calibreweb_url3 }}; + proxy_pass http://127.0.0.1:8083; +} diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 90999d07f..5bf1eea0c 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 @@ -44,6 +44,6 @@ * kalite (menu goes directly to ports 8006-8008) [*] * minetest [*] * openvpn [*] - * pbx + * pbx [*] -[*] Apache, NGINX and the 7 starred roles above could use improvement as of 2020-02-04. \ No newline at end of file +[*] The 6 above starred roles could use improvement, as of 2020-02-14.