From 124a29513acee2d6d952cada48bdf9b367ca6af8 Mon Sep 17 00:00:00 2001
From: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Date: Wed, 20 Dec 2023 13:26:24 +0100
Subject: [PATCH 1/2] update versions to 2023.6.1

---
 docker-compose.yml       | 4 ++--
 server/mergin/version.py | 2 +-
 server/setup.py          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 42a6e38a..104d53ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     networks:
       - merginmaps
   server:
-    image: lutraconsulting/merginmaps-backend:2023.2.0
+    image: lutraconsulting/merginmaps-backend:2023.6.1
     container_name: merginmaps-server
     restart: always
     user: 901:999
@@ -35,7 +35,7 @@ services:
     networks:
       - merginmaps
   web:
-    image: lutraconsulting/merginmaps-frontend:2023.2.0
+    image: lutraconsulting/merginmaps-frontend:2023.6.1
     container_name: merginmaps-web
     restart: always
     depends_on:
diff --git a/server/mergin/version.py b/server/mergin/version.py
index b131a2ad..c73d8283 100644
--- a/server/mergin/version.py
+++ b/server/mergin/version.py
@@ -4,4 +4,4 @@
 
 
 def get_version():
-    return "2023.3.0"
+    return "2023.6.1"
diff --git a/server/setup.py b/server/setup.py
index 0776d696..78e68823 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="mergin",
-    version="2023.3.0",
+    version="2023.6.1",
     url="https://github.com/MerginMaps/mergin",
     license="AGPL-3.0-only",
     author="Lutra Consulting Limited",

From 606f82b712f568bee588090574bb19c5e5dad4a8 Mon Sep 17 00:00:00 2001
From: Tomas Mizera <tomas.mizera@lutraconsulting.co.uk>
Date: Wed, 20 Dec 2023 13:26:46 +0100
Subject: [PATCH 2/2] Update env variables so the the server works on the first
 run

---
 .prod.env | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.prod.env b/.prod.env
index fd65c8ce..1638fa6a 100644
--- a/.prod.env
+++ b/.prod.env
@@ -8,8 +8,8 @@ CONTACT_EMAIL=fixme
 
 #DEBUG=FLASK_DEBUG | False
 
-#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
-LOCAL_PROJECTS=/data/live
+#LOCAL_PROJECTS=/data/live
+LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
 
 #MAINTENANCE_FILE=os.path.join(LOCAL_PROJECTS, 'MAINTENANCE')  # locking file when backups are created
 MAINTENANCE_FILE=/data/MAINTENANCE
@@ -23,8 +23,8 @@ SECRET_KEY=fixme
 
 #SWAGGER_UI=False  # to enable swagger UI console (for test only)
 
-#TEMP_DIR=gettempdir()  # trash dir for temp files being cleaned regularly
-TEMP_DIR=/data/tmp
+#TEMP_DIR=/data/tmp
+TEMP_DIR=gettempdir()  # trash dir for temp files being cleaned regularly
 
 #TESTING=False
 
@@ -154,8 +154,7 @@ CLOSED_ACCOUNT_EXPIRATION=1
 # GLOBAL_STORAGE 1024 * 1024 * 1024
 GLOBAL_STORAGE=10737418240
 
-# GLOBAL_READ False
-GLOBAL_READ=1
+# GLOBAL_READ False - Everyone will be "guest", you need to share projects with them explicitly
 
 # GLOBAL_WRITE False