diff --git a/qbittorrent/rootfs/etc/cont-init.d/30-nginx b/qbittorrent/rootfs/etc/cont-init.d/30-nginx index 285d30a55..1bc81be23 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/30-nginx +++ b/qbittorrent/rootfs/etc/cont-init.d/30-nginx @@ -3,30 +3,36 @@ ################# # NGINX SETTING # ################# -declare port -declare certfile -declare ingress_interface -declare ingress_port -declare keyfile -port=$(bashio::addon.port 80) -if bashio::var.has_value "${port}"; then - bashio::config.require.ssl +declare admin_port +declare qbittorrent_protocol=http -# 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 -# sed -i "s/http/https/g" /etc/nginx/servers/ingress.conf -# else - mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf -# fi +# Generate Ingress configuration +if bashio::config.true 'ssl'; then +qbittorrent_protocol=https 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 +bashio::var.json \ + interface "$(bashio::addon.ip_address)" \ + port "^$(bashio::addon.ingress_port)" \ + protocol "${qbittorrent_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 + +###################### +# VUETORRENT INSTALL # +###################### + +LATEST_RELEASE=$(curl -s -L https://api.github.com/repos/wdaan/vuetorrent/releases/latest \ + | grep "browser_download_url.*zip" \ + | cut -d : -f 2,3 \ + | tr -d \" \ + | xargs) # to trim whitespaceq + +curl -O -J -L $LATEST_RELEASE && \ +unzip vuetorrent.zip -d / +rm /vuetorrent.zip