Merge branch 'master' into release-10.3.z

7 files changed, 13 insertions, 7 deletions

diff --git a/deployment/centos-package-x64/pkg-src b/deployment/centos-package-x64/pkg-src
index dfd6497cf..dfd6497cf 120000..100644
--- a/deployment/centos-package-x64/pkg-src
+++ b/deployment/centos-package-x64/pkg-src
diff --git a/deployment/debian-package-armhf/pkg-src b/deployment/debian-package-armhf/pkg-src
index 4c695fea1..4c695fea1 120000..100644
--- a/deployment/debian-package-armhf/pkg-src
+++ b/deployment/debian-package-armhf/pkg-src
diff --git a/deployment/debian-package-x64/pkg-src/bin/restart.sh b/deployment/debian-package-x64/pkg-src/bin/restart.sh
index 9b64b6d72..9b64b6d72 100644..100755
--- a/deployment/debian-package-x64/pkg-src/bin/restart.sh
+++ b/deployment/debian-package-x64/pkg-src/bin/restart.sh
diff --git a/deployment/fedora-package-x64/pkg-src/restart.sh b/deployment/fedora-package-x64/pkg-src/restart.sh
index 9b64b6d72..9b64b6d72 100644..100755
--- a/deployment/fedora-package-x64/pkg-src/restart.sh
+++ b/deployment/fedora-package-x64/pkg-src/restart.sh
diff --git a/deployment/ubuntu-package-x64/pkg-src b/deployment/ubuntu-package-x64/pkg-src
index 4c695fea1..4c695fea1 120000..100644
--- a/deployment/ubuntu-package-x64/pkg-src
+++ b/deployment/ubuntu-package-x64/pkg-src
diff --git a/deployment/unraid/docker-templates/jellyfin.xml b/deployment/unraid/docker-templates/jellyfin.xml
index 1d97a9f00..57b4cc5ae 100644
--- a/deployment/unraid/docker-templates/jellyfin.xml
+++ b/deployment/unraid/docker-templates/jellyfin.xml
@@ -3,14 +3,15 @@
   <TemplateURL>https://raw.githubusercontent.com/jellyfin/jellyfin/deployment/unraid/docker-templates/jellyfin.xml</TemplateURL>
   <Beta>False</Beta>
   <Category>MediaApp:Video MediaApp:Music MediaApp:Photos MediaServer:Video MediaServer:Music MediaServer:Photos</Category>
-  <Name>JellyFin</Name>
+  <Name>Jellyfin</Name>
   <Description>
-	JellyFin is The Free Software Media Browser	Converted By Community Applications	Always verify this template (and values) against the dockerhub support page for the container!![br][br]
+	Jellyfin is The Free Software Media Browser	Converted By Community Applications	Always verify this template (and values) against the dockerhub support page for the container!![br][br]
   You can add as many mount points as needed for recordings, movies ,etc. [br][br]
   [b][span style='color: #E80000;']Directions:[/span][/b][br]
-  [b]/config[/b] : this is where Jellyfin will store it's databases and configuration.[br][br]
+  [b]/config[/b] : This is where Jellyfin will store it's databases and configuration.[br][br]
   [b]Port[/b] : This is the default port for Jellyfin. (Will add ssl port later)[br][br]
-  [b]Media[/b] : This is the mounting point of your media. When you access it in Jellyfin it will be /media or whatever you chose for a mount point
+  [b]Media[/b] : This is the mounting point of your media. When you access it in Jellyfin it will be /media or whatever you chose for a mount point[br][br]
+  [b]Cache[/b] : This is where Jellyfin will store and manage cached files like images to serve to clients. This is not where all images are stored.[br][br]
   [b]Tip:[/b] You can add more volume mappings if you wish Jellyfin has access to it.
   </Description>
   <Overview>
@@ -35,7 +36,7 @@
   </Networking>
   <Data>
     <Volume>
-      <HostDir>/mnt/cache/appdata/config</HostDir>
+      <HostDir>/mnt/user/appdata/Jellyfin</HostDir>
       <ContainerDir>/config</ContainerDir>
       <Mode>rw</Mode>
     </Volume>
@@ -44,8 +45,13 @@
       <ContainerDir>/media</ContainerDir>
       <Mode>rw</Mode>
     </Volume>
+    <Volume>
+      <HostDir>/mnt/user/appdata/Jellyfin/cache/</HostDir>
+      <ContainerDir>/cache</ContainerDir>
+      <Mode>rw</Mode>
+    </Volume>
   </Data>
   <WebUI>http://[IP]:[PORT:8096]/</WebUI>
-  <Icon>https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/images/emby-icon.png</Icon>
+  <Icon>https://raw.githubusercontent.com/binhex/docker-templates/master/binhex/images/jellyfin-icon.png</Icon>
   <ExtraParams></ExtraParams>
 </Containers>
diff --git a/deployment/windows/install-jellyfin.ps1 b/deployment/windows/install-jellyfin.ps1
index 0cd7f5236..e909a0468 100644
--- a/deployment/windows/install-jellyfin.ps1
+++ b/deployment/windows/install-jellyfin.ps1
@@ -3,7 +3,7 @@
 param(
     [Switch]$Quiet,
     [Switch]$InstallAsService,
-    [pscredential]$ServiceUser,
+    [System.Management.Automation.pscredential]$ServiceUser,
     [switch]$CreateDesktopShorcut,
     [switch]$LaunchJellyfin,
     [switch]$MigrateEmbyLibrary,