From 203a58ea032263cb0c16bd9775497ccf03bda542 Mon Sep 17 00:00:00 2001
From: Adam Dodman <adam.dodman@gmx.com>
Date: Sun, 9 Apr 2017 01:53:06 +0100
Subject: [PATCH] User ID and directory structure refactor

---
 docker-compose.yml | 26 ++++++++++++--------------
 update.sh          |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4497850..c03a3c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,26 +1,19 @@
 version: '2'
 
 services:
-    data:
-        image: tianon/true
-        volumes:
-            - $VOLDIR:/config
-
     nzbget:
         image: adamant/nzbget
-        depends_on:
-            - data
+        volumes:
+            - $VOLDIR/nzbget:/config
         volumes_from:
-            - data
             - container:media
         restart: always
 
     deluge:
         image: adamant/deluge
-        depends_on:
-            - data
+        volumes:
+            - $VOLDIR/deluge:/config
         volumes_from:
-            - data
             - container:media
         restart: always
 
@@ -29,8 +22,9 @@ services:
         depends_on:
              - deluge
              - nzbget
+        volumes:
+            - $VOLDIR/sickrage:/config
         volumes_from:
-            - data
             - container:media
         restart: always
 
@@ -39,8 +33,9 @@ services:
         depends_on:
              - deluge
              - nzbget
+        volumes:
+            - $VOLDIR/couchpotato:/config
         volumes_from:
-            - data
             - container:media
         restart: always
 
@@ -49,8 +44,9 @@ services:
         depends_on:
             - sickrage
             - couchpotato
+        volumes:
+            - $VOLDIR/plex:/config/Plex\ Media\ Server
         volumes_from:
-            - data
             - container:media
         restart: always
         ports:
@@ -69,6 +65,8 @@ services:
             - plex
         volumes_from:
             - data
+        volumes:
+            - $VOLDIR/plexpy:/config
         restart: always
     
     web:
diff --git a/update.sh b/update.sh
index 812e423..1791b9c 100644
--- a/update.sh
+++ b/update.sh
@@ -5,7 +5,7 @@
 
 export VOLDIR="/volumes/media-server"
 SERVICES=("couchpotato" "deluge" "nzbget" "plex" "plexpy" "sickrage" "nginx") 
-SERVICEUID=("745" "647" "236" "787" "426" "439" "0")
+SERVICEUID=("901" "902" "904" "900" "905" "906" "0")
 
 [[ $EUID -ne 0 ]] && echo "Please run this script as root" && exit 1