diff --git a/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/type b/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/type new file mode 100644 index 000000000..3d92b15f2 --- /dev/null +++ b/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/up b/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/up new file mode 100644 index 000000000..c081bdf06 --- /dev/null +++ b/portainer/rootfs /etc/s6-overlay /s6-rc.d/init-portainer/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-portainer/run \ No newline at end of file diff --git a/portainer/rootfs/etc/cont-init.d/30-nginx.sh b/portainer/rootfs/etc/cont-init.d/30-nginx.sh deleted file mode 100755 index 400a6ad54..000000000 --- a/portainer/rootfs/etc/cont-init.d/30-nginx.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash - -################# -# NGINX SETTING # -################# - -#declare admin_port -declare portainer_protocol=http - -# Generate Ingress configuration -if bashio::config.true 'ssl'; then - bashio::config.require.ssl - portainer_protocol=https - sed -i "s|9000|9443|g" /etc/nginx/includes/upstream.conf - sed -i "s|9000|9443|g" /etc/services.d/nginx/run - sed -i "s|9099 default_server|9099 ssl|g" /etc/nginx/templates/ingress.gtpl - sed -i '7 i ssl_certificate /ssl/{{ .certfile }};' /etc/nginx/templates/ingress.gtpl - sed -i '7 i ssl_certificate_key /ssl/{{ .keyfile }};' /etc/nginx/templates/ingress.gtpl - bashio::log.info "Ssl enabled, please use https for connection" -fi - -bashio::var.json \ - interface "$(bashio::addon.ip_address)" \ - port "^$(bashio::addon.ingress_port)" \ - protocol "${portainer_protocol}" \ - certfile "$(bashio::config 'certfile')" \ - keyfile "$(bashio::config 'keyfile')" \ - ssl "^$(bashio::config 'ssl')" | -tempio \ - -template /etc/nginx/templates/ingress.gtpl \ - -out /etc/nginx/servers/ingress.conf diff --git a/portainer/rootfs/etc/cont-init.d/portainer.sh b/portainer/rootfs/etc/cont-init.d/portainer.sh deleted file mode 100755 index 7bda5454e..000000000 --- a/portainer/rootfs/etc/cont-init.d/portainer.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== -# Home Assistant Community Add-on: Portainer -# Runs some initializations for Portainer -# ============================================================================== -bashio::require.unprotected