diff --git a/grocy/config.json b/grocy/config.json index 8e19c26..8fa5c2e 100755 --- a/grocy/config.json +++ b/grocy/config.json @@ -22,10 +22,10 @@ "ssl" ], "ports": { - "80/tcp": 9192 + "80/tcp": null }, "ports_description": { - "80/tcp": "Web interface" + "80/tcp": "Web interface (Not required for Hass.io Ingress)" }, "options": { "culture": "en", diff --git a/grocy/rootfs/etc/cont-init.d/nginx.sh b/grocy/rootfs/etc/cont-init.d/nginx.sh index b6792f2..23cbd65 100755 --- a/grocy/rootfs/etc/cont-init.d/nginx.sh +++ b/grocy/rootfs/etc/cont-init.d/nginx.sh @@ -8,17 +8,20 @@ declare keyfile declare ingress_interface declare ingress_entry -bashio::config.require.ssl +port=$(bashio::addon.port 80) +if bashio::var.has_value "${port}"; then + bashio::config.require.ssl -if bashio::config.true 'ssl'; then - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') + if bashio::config.true 'ssl'; then + certfile=$(bashio::config 'certfile') + keyfile=$(bashio::config 'keyfile') - mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf - sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf - sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf -else - mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf + mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf + sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf + sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf + else + mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf + fi fi ingress_interface=$(bashio::addon.ip_address)