diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile index 05b5825..74f7c0e 100644 --- a/home-panel/Dockerfile +++ b/home-panel/Dockerfile @@ -17,7 +17,7 @@ RUN \ nodejs-current=12.4.0-r0 \ \ && curl -J -L -o /tmp/panel.zip \ - "https://github.com/timmo001/home-panel/releases/download/v1.0.0/home-panel-built.zip" \ + "https://github.com/timmo001/home-panel/releases/download/v1.0.0/home-panel-built-v0.10.0.zip" \ && unzip -d /tmp /tmp/panel.zip \ && mv /tmp/build /opt/panel \ \ diff --git a/home-panel/config.json b/home-panel/config.json index 9061303..307a5d7 100644 --- a/home-panel/config.json +++ b/home-panel/config.json @@ -17,16 +17,13 @@ "hassio_role": "default", "hassio_api": true, "homeassistant_api": true, - "ingress": true, - "ingress_port": 1337, - "panel_icon": "mdi:home", - "homeassistant": "0.92.0b2", + "ingress": false, "ports": { - "80/tcp": null, + "80/tcp": 8234, "3234/tcp": 3234 }, "ports_description": { - "80/tcp": "Web UI (Not required for Hass.io Ingress)", + "80/tcp": "Web UI", "3234/tcp": "API" }, "map": [ diff --git a/home-panel/rootfs/etc/cont-init.d/nginx.sh b/home-panel/rootfs/etc/cont-init.d/nginx.sh index a53a162..844bfb9 100644 --- a/home-panel/rootfs/etc/cont-init.d/nginx.sh +++ b/home-panel/rootfs/etc/cont-init.d/nginx.sh @@ -5,8 +5,6 @@ # ============================================================================== declare port declare certfile -declare ingress_interface -declare ingress_port declare keyfile port=$(bashio::addon.port 80) @@ -25,8 +23,3 @@ if bashio::var.has_value "${port}"; then mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf fi fi - -ingress_port=$(bashio::addon.ingress_port) -ingress_interface=$(bashio::addon.ip_address) -sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf -sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf diff --git a/home-panel/rootfs/etc/nginx/servers/ingress.conf b/home-panel/rootfs/etc/nginx/servers/ingress.conf deleted file mode 100644 index 2f6839f..0000000 --- a/home-panel/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %%interface%%:%%port%% default_server; - - include /etc/nginx/includes/server_params.conf; - - allow 172.30.32.2; - deny all; -}