From 396b8a15b07996f3069998c0a723485cb4ac7657 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 3 May 2023 12:32:16 +0200 Subject: [PATCH] Fix https://github.com/alexbelgium/hassio-addons/issues/803 --- whoogle/CHANGELOG.md | 9 +++++++++ whoogle/config.json | 2 +- whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh | 9 ++++++--- whoogle/rootfs/etc/nginx/servers/ingress.conf | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/whoogle/CHANGELOG.md b/whoogle/CHANGELOG.md index 32562d22c..f17c4a44d 100644 --- a/whoogle/CHANGELOG.md +++ b/whoogle/CHANGELOG.md @@ -1,24 +1,33 @@ +- Fix missing images in ingress + ### 0.8.2-2 (09-04-2023) + - Minor bugs fixed ## 0.8.2 (08-04-2023) + - Update to latest version from benbusby/whoogle-search ## 0.8.1 (25-12-2022) + - Update to latest version from benbusby/whoogle-search - WARNING : update to supervisor 2022.11 before installing ## 0.8.0 (26-11-2022) + - Update to latest version from benbusby/whoogle-search ## 0.7.4 (14-06-2022) + - Update to latest version from benbusby/whoogle-search ## 0.7.3 (04-06-2022) + - Update to latest version from benbusby/whoogle-search - Addition of ingress ## 0.7.2 (27-04-2022) + - Update to latest version from benbusby/whoogle-search - Add codenotary sign diff --git a/whoogle/config.json b/whoogle/config.json index 190fba3f9..55dd76c04 100644 --- a/whoogle/config.json +++ b/whoogle/config.json @@ -108,5 +108,5 @@ }, "slug": "whoogle-search", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/whoogle", - "version": "0.8.2-2" + "version": "0.8.2-3" } \ No newline at end of file diff --git a/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh index 37cd4cb2a..a4830f247 100755 --- a/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh +++ b/whoogle/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -38,12 +38,15 @@ if bashio::var.has_value "${port}"; then fi fi -ingress_port=$(bashio::addon.ingress_port) -ingress_interface=$(bashio::addon.ip_address) -ingress_entry=$(bashio::addon.ingress_entry) +ingress_port="$(bashio::addon.ingress_port)" +ingress_interface="$(bashio::addon.ip_address)" +ingress_entry="$(bashio::addon.ingress_entry)" +ingress_entry_modified="$(echo "$ingress_entry" | sed 's/[@_!#$%^&*()<>?/\|}{~:]//g')" + sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/ingress.conf +sed -i "s#%%ingress_entry_modified%%#/${ingress_entry_modified}#g" /etc/nginx/servers/ingress.conf dns_host=127.0.0.11 sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf diff --git a/whoogle/rootfs/etc/nginx/servers/ingress.conf b/whoogle/rootfs/etc/nginx/servers/ingress.conf index 4e0edef6b..4adb6ccfe 100644 --- a/whoogle/rootfs/etc/nginx/servers/ingress.conf +++ b/whoogle/rootfs/etc/nginx/servers/ingress.conf @@ -12,6 +12,10 @@ server { proxy_pass http://backend; #Allow frame proxy_hide_header 'x-frame-options'; + # Correct url for images + sub_filter_once off; + sub_filter_types *; + sub_filter %%ingress_entry_modified%% %%ingress_entry%%; } }