From 273c5731c8a015a35113089caf3d4345d6e6aebe Mon Sep 17 00:00:00 2001
From: ben <perso@acdlog.com>
Date: Thu, 25 Feb 2021 23:32:02 +0100
Subject: [PATCH] =?UTF-8?q?conflit=20:=20r=C3=A9pertoire=20renomm=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plex_et_tautulli/docker-compose.yml       | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)
 rename {Exemples docker-compose => ZZ_Exemples}/plex_et_tautulli/docker-compose.yml (96%)

diff --git a/Exemples docker-compose/plex_et_tautulli/docker-compose.yml b/ZZ_Exemples/plex_et_tautulli/docker-compose.yml
similarity index 96%
rename from Exemples docker-compose/plex_et_tautulli/docker-compose.yml
rename to ZZ_Exemples/plex_et_tautulli/docker-compose.yml
index eea444e..bf0aaaa 100644
--- a/Exemples docker-compose/plex_et_tautulli/docker-compose.yml	
+++ b/ZZ_Exemples/plex_et_tautulli/docker-compose.yml
@@ -1,42 +1,42 @@
-## Discord Plex FR : https://discord.gg/ERpYMqS
-## Version 2021-02-25
-version: "2.1"
-services:
-  plex:
-    image: ghcr.io/linuxserver/plex
-    container_name: plex
-    network_mode: host
-# Decommenter les 2 lignes suivantes pour que watchtower surveille ce conteneur
-#    labels:
-#      - com.centurylinklabs.watchtower.enable=true
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - VERSION=latest
-      - UMASK_SET=022
-    volumes:
-      - /volume1/docker/plex/config:/config
-      - /volume1/docker/plex/transcode:/transcode
-      - /volume1/media/music:/data/music
-      - /volume1/media/movies:/data/movies
-      - /volume1/media/tvshow:/data/tvshow
-# Decommenter les 2 lignes suivantes pour activer le transcodage matériel ( si NAS compatible )
-#    devices:
-#      - /dev/dri:/dev/dri
-    restart: unless-stopped
-
-  tautulli:
-    image: ghcr.io/linuxserver/tautulli
-    container_name: tautulli
-    network_mode: host
-# Decommenter les 2 lignes suivantes pour que watchtower surveille ce conteneur
-#    labels:
-#      - com.centurylinklabs.watchtower.enable=true
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Paris
-    volumes:
-      - /volume1/docker/tautulli/config:/config
-      - /volume1/docker/plex/config/Library/Application Support/Plex Media Server/Logs:/logs
-    restart: unless-stopped
+## Discord Plex FR : https://discord.gg/ERpYMqS
+## Version 2021-02-25
+version: "2.1"
+services:
+  plex:
+    image: ghcr.io/linuxserver/plex
+    container_name: plex
+    network_mode: host
+# Decommenter les 2 lignes suivantes pour que watchtower surveille ce conteneur
+#    labels:
+#      - com.centurylinklabs.watchtower.enable=true
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - VERSION=latest
+      - UMASK_SET=022
+    volumes:
+      - /volume1/docker/plex/config:/config
+      - /volume1/docker/plex/transcode:/transcode
+      - /volume1/media/music:/data/music
+      - /volume1/media/movies:/data/movies
+      - /volume1/media/tvshow:/data/tvshow
+# Decommenter les 2 lignes suivantes pour activer le transcodage matériel ( si NAS compatible )
+#    devices:
+#      - /dev/dri:/dev/dri
+    restart: unless-stopped
+
+  tautulli:
+    image: ghcr.io/linuxserver/tautulli
+    container_name: tautulli
+    network_mode: host
+# Decommenter les 2 lignes suivantes pour que watchtower surveille ce conteneur
+#    labels:
+#      - com.centurylinklabs.watchtower.enable=true
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
+    volumes:
+      - /volume1/docker/tautulli/config:/config
+      - /volume1/docker/plex/config/Library/Application Support/Plex Media Server/Logs:/logs
+    restart: unless-stopped