Restore

radarr/CHANGELOG.md

@@ -1,6 +1,13 @@
 
+## 5.1.3.8246 (18-11-2023)
+- Update to latest version from linuxserver/docker-radarr
+### 5.0.3.8127-2 (01-11-2023)
+- Minor bugs fixed
+- Fix : disable authentification when using ingress
+
 ## 5.0.3.8127 (14-10-2023)
 - Update to latest version from linuxserver/docker-radarr
+
 ### 4.7.5.7809-2 (27-09-2023)
 - Minor bugs fixed
 

radarr/Dockerfile

@@ -28,9 +28,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/radarr"
-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 #
@@ -43,8 +43,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 BASHIO_VERSION=0.14.3
@@ -54,8 +54,8 @@ ENV PACKAGES="jq \
     keyutils"
 
 # 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 /

radarr/config.json

@@ -103,5 +103,5 @@
   "slug": "radarr_nas",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr",
-  "version": "5.0.3.8127"
+  "version": "5.1.3.8246"
 }

radarr/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=radarr
+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

radarr/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

radarr/updater.json

@@ -1,8 +1,8 @@
 {
-  "last_update": "14-10-2023",
+  "last_update": "18-11-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "radarr",
   "source": "github",
   "upstream_repo": "linuxserver/docker-radarr",
-  "upstream_version": "5.0.3.8127"
+  "upstream_version": "5.1.3.8246"
 }