From e0d97242975b00d80cde959a3362c281a8656f91 Mon Sep 17 00:00:00 2001
From: enrico ferreguti <enricofer@gmail.com>
Date: Sat, 15 Jun 2024 16:00:49 +0200
Subject: [PATCH] folder and volumes reorder

---
 .gitignore               |  8 +++++---
 docker-compose.yml       | 15 ++++++++-------
 kart_versions/readme.txt |  1 -
 media/readme.txt         |  1 -
 4 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 kart_versions/readme.txt
 delete mode 100644 media/readme.txt

diff --git a/.gitignore b/.gitignore
index 2944a9c..b3a5c59 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 *.pyc
 __pycache__
-webapp/static*
-media/*
-kart_versions/*
+data/static/*
+data/media/*
+data/kart_versions/*
+data/pgdata/*
+test_data*
 
 .DS_Store
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 62a820d..897f063 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,9 +17,10 @@ services:
     depends_on:
       - postgis_djakart
     volumes:
-      - ./media:/media
+      - ./data/media:/media
+      - ./data/static:/app/static
       - ./webapp:/app
-      - ./kart_versions:/kart_versions
+      - ./data/kart_versions:/kart_versions
     healthcheck:
       test: wget -qO- http://localhost:8000/healthcheck/ || exit 1
       start_period: 30s
@@ -34,7 +35,7 @@ services:
     ports:
       - 5435:5432
     volumes:
-      - djakart_pgdata:/var/lib/postgresql/pgdata/
+      - ./data/pgdata:/var/lib/postgresql/pgdata/
       - ./initdb.sh:/docker-entrypoint-initdb.d/initdb.sh
 
   qgisserver_djakart:
@@ -43,7 +44,7 @@ services:
       - .env
     volumes:
       #- ./servizi:/servizi
-      - ./kart_versions:/kart_versions
+      - ./data/kart_versions:/kart_versions
       - ./webapp/djakart/otf_qgisserver_plugin:/plugins/otf_qgisserver_plugin
       - ./000-default.conf:/etc/apache2/sites-enabled/000-default.conf
 
@@ -52,7 +53,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ./webapp/static:/static
+      - ./data/static:/static
       - ./nginx.conf:/etc/nginx/conf.d/default.conf
     ports:
       - 9889:80
@@ -60,5 +61,5 @@ services:
       - qgisserver_djakart
       - webapp_djakart
 
-volumes:
-  djakart_pgdata:
\ No newline at end of file
+#volumes:
+#  djakart_pgdata:
diff --git a/kart_versions/readme.txt b/kart_versions/readme.txt
deleted file mode 100644
index cdbd0ec..0000000
--- a/kart_versions/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-placeholder for folder containing kart versions
diff --git a/media/readme.txt b/media/readme.txt
deleted file mode 100644
index 5edd287..0000000
--- a/media/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-placeholder for media folder