From 54bb26f5d5083b96a92450ce36439296d7399794 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:17:02 +0200 Subject: [PATCH 1/7] Update 90-configuration.sh --- portainer/rootfs/etc/cont-init.d/90-configuration.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portainer/rootfs/etc/cont-init.d/90-configuration.sh b/portainer/rootfs/etc/cont-init.d/90-configuration.sh index 6cb70b78c..c63616178 100644 --- a/portainer/rootfs/etc/cont-init.d/90-configuration.sh +++ b/portainer/rootfs/etc/cont-init.d/90-configuration.sh @@ -26,11 +26,11 @@ bashio::log.info "... password set to $PASSWORD" bashio::config.require.ssl if bashio::config.true 'ssl'; then - bashio::log.info "ssl enabled. If webui don't work, disable ssl or check your certificate paths" + bashio::log.info "... ssl enabled. If webui don't work, disable ssl or check your certificate paths" #set variables CERTFILE="/ssl/$(bashio::config 'certfile')" KEYFILE="/ssl/$(bashio::config 'keyfile')" - options+=(--ssl true) + options+=(--ssl 'true') options+=(--sslcert /ssl/$CERTFILE) options+=(--sslkey /ssl/$KEYFILE) bashio::log.info "... ssl activated" From 3fb2231bee4b34104224465197d838204ae440be Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:18:11 +0200 Subject: [PATCH 2/7] Update 90-configuration.sh --- portainer/rootfs/etc/cont-init.d/90-configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portainer/rootfs/etc/cont-init.d/90-configuration.sh b/portainer/rootfs/etc/cont-init.d/90-configuration.sh index c63616178..4a6b036fd 100644 --- a/portainer/rootfs/etc/cont-init.d/90-configuration.sh +++ b/portainer/rootfs/etc/cont-init.d/90-configuration.sh @@ -30,7 +30,7 @@ if bashio::config.true 'ssl'; then #set variables CERTFILE="/ssl/$(bashio::config 'certfile')" KEYFILE="/ssl/$(bashio::config 'keyfile')" - options+=(--ssl 'true') + options+=(--ssl) options+=(--sslcert /ssl/$CERTFILE) options+=(--sslkey /ssl/$KEYFILE) bashio::log.info "... ssl activated" From c52b844f740b219f8822073554d114c6a7a1b412 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:22:14 +0200 Subject: [PATCH 3/7] Update config.json --- portainer/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/portainer/config.json b/portainer/config.json index 965d5a5ae..f284c841a 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -15,7 +15,8 @@ "init": false, "map": ["ssl"], "ports": { - "9000/tcp": 9000 + "9000/tcp": 9000, + "8000/tcp": null }, "ports_description": { "9000/tcp": "Web UI port", From 8355955bb2b1267ffad71c7e011e2a80de90ac5a Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:30:43 +0200 Subject: [PATCH 4/7] Update config.json --- portainer/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portainer/config.json b/portainer/config.json index f284c841a..2c146af25 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -29,12 +29,12 @@ "ssl": false, "certfile": "fullchain.pem", "keyfile": "privkey.pem", - "password": "default" + "password": "default" }, "schema": { "ssl": "bool", "certfile": "str", "keyfile": "str", - "password": "str" + "password": "str" } } From 40d42fe40fb77f9e5ae5120d1afe900ffdb0f4f7 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:31:24 +0200 Subject: [PATCH 5/7] Update config.json --- portainer/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portainer/config.json b/portainer/config.json index 2c146af25..b0456ca94 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -6,7 +6,7 @@ "description": "Manage your Docker environment with ease", "url": "https://github.com/hassio-addons/addon-portainer", "advanced": true, - "ingress": false, + "ingress": true, "ingress_port": 1337, "startup": "services", "panel_icon": "mdi:docker", From f9663d33369e7bca9a3b9c0714dab610efacbf64 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:32:41 +0200 Subject: [PATCH 6/7] Update config.json --- portainer/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portainer/config.json b/portainer/config.json index b0456ca94..2c146af25 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -6,7 +6,7 @@ "description": "Manage your Docker environment with ease", "url": "https://github.com/hassio-addons/addon-portainer", "advanced": true, - "ingress": true, + "ingress": false, "ingress_port": 1337, "startup": "services", "panel_icon": "mdi:docker", From 9b2918c03cbd76005ba3eb31ab3dea241ad23b00 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 6 May 2021 13:40:53 +0200 Subject: [PATCH 7/7] Update 90-configuration.sh --- portainer/rootfs/etc/cont-init.d/90-configuration.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portainer/rootfs/etc/cont-init.d/90-configuration.sh b/portainer/rootfs/etc/cont-init.d/90-configuration.sh index 4a6b036fd..886ad61f3 100644 --- a/portainer/rootfs/etc/cont-init.d/90-configuration.sh +++ b/portainer/rootfs/etc/cont-init.d/90-configuration.sh @@ -28,8 +28,8 @@ bashio::config.require.ssl if bashio::config.true 'ssl'; then bashio::log.info "... ssl enabled. If webui don't work, disable ssl or check your certificate paths" #set variables - CERTFILE="/ssl/$(bashio::config 'certfile')" - KEYFILE="/ssl/$(bashio::config 'keyfile')" + CERTFILE="$(bashio::config 'certfile')" + KEYFILE="$(bashio::config 'keyfile')" options+=(--ssl) options+=(--sslcert /ssl/$CERTFILE) options+=(--sslkey /ssl/$KEYFILE)