From 1277b469f5c1292f6b37c531e9fa8afb802ad0fa Mon Sep 17 00:00:00 2001
From: Paul Walko <paul@seaturtle.pw>
Date: Sun, 8 Sep 2019 22:23:30 +0200
Subject: [PATCH] change persistent dir structure

---
 .gitignore                        | 6 +++---
 madone/docker/nginx/launch.sh     | 2 +-
 madone/docker/syncthing/launch.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a8b54b..71cb461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,6 @@ fogcutter/docker/syncthing/syncthing-config
 fogcutter/docker/syncthing/syncthing-sync
 fogcutter/docker/monitoring/grafana/grafana-data
 fogcutter/docker/monitoring/prometheus/prometheus-data
-madone/docker/nginx/config
-madone/docker/syncthing/config
-madone/docker/syncthing/sync
+madone/docker/nginx/nginx-config
+madone/docker/syncthing/syncthing-config
+madone/docker/syncthing/syncthing-sync
diff --git a/madone/docker/nginx/launch.sh b/madone/docker/nginx/launch.sh
index ad41271..0e0c72b 100755
--- a/madone/docker/nginx/launch.sh
+++ b/madone/docker/nginx/launch.sh
@@ -12,7 +12,7 @@ docker run \
     --env SUBDOMAINS=madone \
     --env VALIDATION=html \
     --env TZ=US/Eastern \
-    --volume $PWD/config:/config:rw \
+    --volume $PWD/nginx-config:/config:rw \
     --volume $PWD/nginx.conf:/config/nginx/nginx.conf:ro \
     --volume $PWD/site-confs:/config/nginx/site-confs:ro \
     --volume $PWD/../syncthing/sync:/sync-docker:ro \
diff --git a/madone/docker/syncthing/launch.sh b/madone/docker/syncthing/launch.sh
index 7dad8ad..dc3b04d 100755
--- a/madone/docker/syncthing/launch.sh
+++ b/madone/docker/syncthing/launch.sh
@@ -11,8 +11,8 @@ docker run \
     --env PGID=1000 \
     --env TZ=Europe/London \
     --env UMASK_SET=022 \
-    --volume $PWD/config:/config:rw \
-    --volume $PWD/sync:/sync-docker:rw \
+    --volume $PWD/syncthing-config:/config:rw \
+    --volume $PWD/syncthing-sync:/sync-docker:rw \
     --publish 22000:22000 \
     --publish 21027:21027/udp \
     --network pew-net \