Restore

2026-04-13 19:10:35 +02:00 · 2023-11-21 09:53:56 +01:00
parent 2e6e4693a7
commit 8e035dde96
350 changed files with 1908 additions and 1328 deletions
--- a/sonarr/CHANGELOG.md
+++ b/sonarr/CHANGELOG.md
@@ -1,4 +1,22 @@

+## 4.0.0.725 (18-11-2023)
+- Update to latest version from linuxserver/docker-sonarr
+
+## 4.0.0.719 (11-11-2023)
+- Update to latest version from linuxserver/docker-sonarr
+
+## 4.0.0.710 (04-11-2023)
+- Update to latest version from linuxserver/docker-sonarr
+### 4.0.0.703-2 (01-11-2023)
+- Minor bugs fixed
+- Fix : disable authentification when using ingress
+
+## 4.0.0.703 (28-10-2023)
+- Update to latest version from linuxserver/docker-sonarr
+
+## 4.0.0.700 (20-10-2023)
+- Update to latest version from linuxserver/docker-sonarr
+
 ## 4.0.0.697 (14-10-2023)
 - Update to latest version from linuxserver/docker-sonarr
 - Breaking change : update to v4
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -16,7 +16,7 @@

 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="4.0.0.697"
+ARG BUILD_UPSTREAM="4.0.0.725"
 FROM ${BUILD_FROM}

 ##################
@@ -29,9 +29,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
    S6_SERVICES_GRACETIME=0

 # Global LSIO modifications
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/sonarr"
-RUN if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
+RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh

 ##################
 # 3 Install apps #
@@ -44,8 +44,8 @@ COPY rootfs/ /
 ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh"

 # Automatic modules download
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
-RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh

 # Manual apps
 ENV PACKAGES="jq \
@@ -54,8 +54,8 @@ ENV PACKAGES="jq \
    keyutils nginx"

 # Automatic apps & bashio
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
-RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh

 ################
 # 4 Entrypoint #
@@ -63,11 +63,11 @@ RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh

 # Add entrypoint
 ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"

 # Entrypoint modifications
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
-RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh

 #
 #WORKDIR /
--- a/sonarr/config.json
+++ b/sonarr/config.json
@@ -103,5 +103,5 @@
  "slug": "sonarr_nas",
  "udev": true,
  "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr",
-  "version": "4.0.0.697"
+  "version": "4.0.0.725"
 }
--- a/sonarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh
+++ b/sonarr/rootfs/etc/cont-init.d/32-nginx_ingress.sh
@@ -14,3 +14,35 @@ ingress_entry=$(bashio::addon.ingress_entry)
 sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
 sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
 sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
+
+##################
+# CONFIG SETTING #
+##################
+
+# Values
+slug=sonarr
+CONFIG_LOCATION=/config/addons_config/"$slug"/config.xml
+
+if [ -f "$CONFIG_LOCATION" ]; then
+  # Set UrlBase
+  if ! bashio::config.true "ingress_disabled"; then
+    bashio::log.warning "---------------------------"
+    bashio::log.warning "Ingress is enabled, authentification will be disabled and should be managed through HA itself. If you need authentification, please disable ingress in addon options"
+    bashio::log.warning "---------------------------"
+    # Define UrlBase
+    sed -i "/UrlBase/d" "$CONFIG_LOCATION"
+    sed -i "2a <UrlBase>$slug<\/UrlBase>" "$CONFIG_LOCATION"
+    # Disable local auth
+    sed -i "/AuthenticationType/d" "$CONFIG_LOCATION"
+    sed -i "2a <AuthenticationType>DisabledForLocalAddresses</AuthenticationType>" "$CONFIG_LOCATION"
+    # Disable local auth
+    sed -i "/AuthenticationMethod/d" "$CONFIG_LOCATION"
+    sed -i "2a <AuthenticationMethod>external</AuthenticationMethod>" "$CONFIG_LOCATION"
+  else
+    bashio::log.warning "---------------------------"
+    bashio::log.info "Disabling ingress and enabling authentification"
+    bashio::log.warning "---------------------------"
+    sed -i "/UrlBase/d" "$CONFIG_LOCATION"
+    sed -i "/<AuthenticationMethod>external/d" "$CONFIG_LOCATION"
+  fi
+fi
--- a/sonarr/rootfs/etc/services.d/nginx/run
+++ b/sonarr/rootfs/etc/services.d/nginx/run
@@ -19,24 +19,12 @@ if bashio::config.has_value 'CONFIG_LOCATION'; then
 fi

 # Set UrlBase
-if ! grep -q "<UrlBase>/$slug</UrlBase>" "$CONFIG_LOCATION" && ! bashio::config.true "ingress_disabled"; then
+if ! grep -q "<UrlBase>$slug</UrlBase>" "$CONFIG_LOCATION" && ! bashio::config.true "ingress_disabled"; then
  bashio::log.warning "BaseUrl not set properly, restarting"
  sed -i "/UrlBase/d" "$CONFIG_LOCATION"
-  sed -i "/<Config>/a <UrlBase>\/$slug<\/UrlBase>" "$CONFIG_LOCATION"
+  sed -i "/<Config>/a <UrlBase>$slug<\/UrlBase>" "$CONFIG_LOCATION"
  bashio::addon.restart
 fi

-# Disable Ingress
-if bashio::config.true "ingress_disabled"; then
-    bashio::log.info "Ingress is disabled, removing base url"
-
-    # Remove BaseUrl
-    if grep -q "$slug" "$CONFIG_LOCATION"; then
-      bashio::log.warning "BaseUrl removed, restarting"
-      sed -i "/$slug/d" "$CONFIG_LOCATION"
-      bashio::addon.restart
-    fi
-fi
-
 bashio::log.info "Starting NGinx..."
 exec nginx
--- a/sonarr/stats.png
+++ b/sonarr/stats.png
--- a/sonarr/updater.json
+++ b/sonarr/updater.json
@@ -1,9 +1,9 @@
 {
  "github_beta": true,
-  "last_update": "14-10-2023",
+  "last_update": "18-11-2023",
  "repository": "alexbelgium/hassio-addons",
  "slug": "sonarr",
  "source": "github",
  "upstream_repo": "linuxserver/docker-sonarr",
-  "upstream_version": "4.0.0.697"
+  "upstream_version": "4.0.0.725"
 }