From 17e307973fbd5ad8771fc7284d9a5ef9927a1749 Mon Sep 17 00:00:00 2001
From: Felix <me@nutomic.com>
Date: Mon, 9 Mar 2020 01:35:11 +0100
Subject: [PATCH] Move volumes into subfolder (ref #474)

---
 ansible/templates/docker-compose.yml | 10 +++-------
 docker/dev/docker-compose.yml        |  4 ++--
 docker/prod/docker-compose.yml       |  8 ++------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index bf9aeeb..acae8b2 100644
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - POSTGRES_PASSWORD={{ postgres_password }}
       - POSTGRES_DB=lemmy
     volumes:
-      - lemmy_db:/var/lib/postgresql/data
+      - ./volumes/postgres:/var/lib/postgresql/data
     restart: always
 
   lemmy_pictshare:
@@ -27,7 +27,7 @@ services:
     ports:
       - "127.0.0.1:8537:80"
     volumes:
-      - lemmy_pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
 
   lemmy_iframely:
@@ -42,8 +42,4 @@ services:
     image: mwader/postfix-relay
     environment:
       - POSTFIX_myhostname={{ domain }}
-    restart: "always"
-volumes:
-  lemmy_db:
-  lemmy_pictshare:
-  lemmy_iframely:
+    restart: "always"
\ No newline at end of file
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 987be4d..9957cf1 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=lemmy
     volumes:
-      - lemmy_db:/var/lib/postgresql/data
+      - ./volumes/postgres:/var/lib/postgresql/data
     restart: always
   lemmy:
     build: 
@@ -26,7 +26,7 @@ services:
     ports:
       - "127.0.0.1:8537:80"
     volumes:
-      - lemmy_pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
   lemmy_iframely:
     image: dogbin/iframely:latest
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 3e0b828..9f0f5d6 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - POSTGRES_PASSWORD=password
       - POSTGRES_DB=lemmy
     volumes:
-      - lemmy_db:/var/lib/postgresql/data
+      - ./volumes/postgres:/var/lib/postgresql/data
     restart: always
   lemmy:
     image: dessalines/lemmy:v0.6.33
@@ -24,7 +24,7 @@ services:
     ports:
       - "127.0.0.1:8537:80"
     volumes:
-      - lemmy_pictshare:/usr/share/nginx/html/data
+      - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
   lemmy_iframely:
     image: dogbin/iframely:latest
@@ -33,7 +33,3 @@ services:
     volumes:
       - ./iframely.config.local.js:/iframely/config.local.js:ro
     restart: always
-volumes:
-  lemmy_db:
-  lemmy_pictshare:
-  lemmy_iframely: