hassio-addons/addon-home-panel
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-home-panel.git synced 2025-05-05 03:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

🔨 ⬆️ Upgrade base and use Hass.io DNS as NGinx resolver

Browse source
This commit is contained in:
Timmo 2019-08-31 22:58:06 +01:00
parent 5cb1f83e99
commit ef0ea60964
7 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -8,8 +8,8 @@ variables:
ADDON_LEGACY_TAGS: "true" ADDON_LEGACY_TAGS: "true"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:4.0.2" ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:4.1.1"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:4.0.2" ADDON_AMD64_BASE: "hassioaddons/base-amd64:4.1.1"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:4.0.2" ADDON_ARMHF_BASE: "hassioaddons/base-armhf:4.1.1"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:4.0.2" ADDON_ARMV7_BASE: "hassioaddons/base-armv7:4.1.1"
ADDON_I386_BASE: "hassioaddons/base-i386:4.0.2" ADDON_I386_BASE: "hassioaddons/base-i386:4.1.1"

2
home-panel/Dockerfile
View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:4.0.2 ARG BUILD_FROM=hassioaddons/base:4.1.1
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}

10
home-panel/build.json
View file

@ -1,11 +1,11 @@
{ {
"args": {}, "args": {},
"build_from": { "build_from": {
"aarch64": "hassioaddons/base-aarch64:4.0.2", "aarch64": "hassioaddons/base-aarch64:4.1.1",
"amd64": "hassioaddons/base-amd64:4.0.2", "amd64": "hassioaddons/base-amd64:4.1.1",
"armhf": "hassioaddons/base-armhf:4.0.2", "armhf": "hassioaddons/base-armhf:4.1.1",
"armv7": "hassioaddons/base-armv7:4.0.2", "armv7": "hassioaddons/base-armv7:4.1.1",
"i386": "hassioaddons/base-i386:4.0.2" "i386": "hassioaddons/base-i386:4.1.1"
}, },
"squash": false "squash": false
} }

13
home-panel/rootfs/etc/cont-init.d/nginx.sh
View file

@ -1,10 +1,13 @@
#!/usr/bin/with-contenv bashio #!/usr/bin/with-contenv bashio
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: Home Panel # Community Hass.io Add-ons: Home Panel
# Configures NGINX for use with thelounge # Configures NGINX for use with Home Panel
# ============================================================================== # ==============================================================================
declare port declare port
declare certfile declare certfile
declare hassio_dns
declare ingress_interface
declare ingress_port
declare keyfile declare keyfile
port=$(bashio::addon.port 80) port=$(bashio::addon.port 80)
@ -23,3 +26,11 @@ if bashio::var.has_value "${port}"; then
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
fi fi
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
hassio_dns=$(bashio::dns.host)
sed -i "s/%%hassio_dns%%/${hassio_dns}/g" /etc/nginx/includes/resolver.conf

2
home-panel/rootfs/etc/nginx/includes/resolver.conf
View file

@ -1 +1 @@
resolver 127.0.0.11; resolver %%hassio_dns%%;

6
home-panel/rootfs/etc/nginx/includes/server_params.conf
View file

@ -1,6 +1,6 @@
root /dev/null; root /dev/null;
server_name $hostname; server_name $hostname;
add_header "X-Content-Type-Options" "nosniff"; add_header X-Content-Type-Options nosniff;
add_header "X-XSS-Protection" "1; mode=block"; add_header X-XSS-Protection "1; mode=block";
add_header "X-Robots-Tag" "none"; add_header X-Robots-Tag none;

1
home-panel/rootfs/etc/nginx/servers/direct-ssl.disabled
View file

@ -5,6 +5,7 @@ server {
include /etc/nginx/includes/ssl_params.conf; include /etc/nginx/includes/ssl_params.conf;
include /etc/nginx/includes/proxy_params.conf; include /etc/nginx/includes/proxy_params.conf;
ssl on;
ssl_certificate /ssl/%%certfile%%; ssl_certificate /ssl/%%certfile%%;
ssl_certificate_key /ssl/%%keyfile%%; ssl_certificate_key /ssl/%%keyfile%%;