From 7a4350f648d26215d46acb555223d31b6efc9d15 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 25 May 2020 19:56:39 +0200
Subject: [PATCH] v6.31

+ DietPi-Software | Sonarr: Install from stable/master branch instead of develop
+ DietPi-Software | Sonarr/Radarr/Lidarr: Add /media to ReadWritePaths to not break instances where users use /media for their mounts: https://github.com/MichaIng/DietPi/issues/3561
+ DietPi-Software | Sonarr/Radarr/Lidarr/Jackett: When enabling services for systemd-controlled startup at boot, wait for dietpi-boot.service which is a better measure to ensure network is up and time sync as well, required for any encrypted network access where certificates timestamps must match.
---
 dietpi/dietpi-software | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 5c5e49afb7..8b5488fbe6 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -5444,7 +5444,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 				else
 
 					DEPS_LIST='mediainfo'
-					Download_Install 'https://download.sonarr.tv/v2/develop/mono/NzbDrone.develop.tar.gz' /opt
+					Download_Install 'https://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz' /opt
 
 				fi
 
@@ -5452,7 +5452,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 			else
 
 				apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0xA236C58F409091A18ACA53CBEBFF6B99D9B78493
-				echo 'deb https://apt.sonarr.tv/ develop main' > /etc/apt/sources.list.d/sonarr.list
+				echo 'deb https://apt.sonarr.tv/ master main' > /etc/apt/sources.list.d/sonarr.list
 				G_AGUP
 				G_AGI nzbdrone
 
@@ -11381,7 +11381,7 @@ _EOF_
 [Unit]
 Description=Sonarr Daemon (DietPi)
 Wants=network-online.target
-After=network-online.target
+After=network-online.target dietpi-boot.service
 
 [Service]
 SyslogIdentifier=Sonarr
@@ -11398,7 +11398,7 @@ ProtectHome=true
 PrivateDevices=true
 ProtectKernelTunables=true
 ProtectControlGroups=true
-ReadWritePaths=/opt/NzbDrone /mnt /var/log/sonarr /tmp
+ReadWritePaths=/opt/NzbDrone /mnt /media /var/log/sonarr /tmp
 
 [Install]
 WantedBy=multi-user.target
@@ -11435,7 +11435,7 @@ _EOF_
 [Unit]
 Description=Radarr Daemon (DietPi)
 Wants=network-online.target
-After=network-online.target
+After=network-online.target dietpi-boot.service
 
 [Service]
 SyslogIdentifier=Radarr
@@ -11452,7 +11452,7 @@ ProtectHome=true
 PrivateDevices=true
 ProtectKernelTunables=true
 ProtectControlGroups=true
-ReadWritePaths=/opt/Radarr /mnt /var/log/radarr /tmp
+ReadWritePaths=/opt/Radarr /mnt /media /var/log/radarr /tmp
 
 [Install]
 WantedBy=multi-user.target
@@ -11489,7 +11489,7 @@ _EOF_
 [Unit]
 Description=Lidarr Daemon (DietPi)
 Wants=network-online.target
-After=network-online.target
+After=network-online.target dietpi-boot.service
 
 [Service]
 SyslogIdentifier=Lidarr
@@ -11506,7 +11506,7 @@ ProtectHome=true
 PrivateDevices=true
 ProtectKernelTunables=true
 ProtectControlGroups=true
-ReadWritePaths=/opt/Lidarr /mnt /var/log/lidarr /tmp
+ReadWritePaths=/opt/Lidarr /mnt /media /var/log/lidarr /tmp
 
 [Install]
 WantedBy=multi-user.target
@@ -11579,7 +11579,7 @@ _EOF_
 [Unit]
 Description=Jackett (DietPi)
 Wants=network-online.target
-After=network-online.target
+After=network-online.target dietpi-boot.service
 
 [Service]
 SyslogIdentifier=jackett