Release 4.0

LICENSES/EE-used-libs.json

@@ -255,10 +255,6 @@
         "library": "requests",
         "version": "2.31.0"
     },
-    {
-        "library": "requests-toolbelt",
-        "version": "0.9.1"
-    },
     {
         "library": "result",
         "version": "0.5.0"
@@ -335,10 +331,6 @@
         "library": "WTForms-JSON",
         "version": "0.3.5"
     },
-    {
-        "library": "zipfly",
-        "version": "6.0.3"
-    },
     {
         "library": "zipp",
         "version": "3.17.0"
@@ -623,4 +615,4 @@
         "library": "xml-utils",
         "version": "1.7.0"
     }
-]
+]

deployment/common/nginx.conf

@@ -27,16 +27,15 @@ server {
 
    # proxy to backend
    # we need to disable buffering for these endpoints which use stream (up or down)
-   # /v1/project/download/
-   location ~ /v1/project/download/ {
+   location ~ /app/projects/([^/]+)/download {
      # unfortunately, proxy settings do not support inheritance within nested locations, hence copied set up from root location
      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
      proxy_set_header X-Forwarded-Proto $scheme;
      proxy_set_header Host $http_host;
      # we don't want nginx trying to do something clever with
      # redirects, we set the Host: header above already.
      proxy_redirect off;
-     proxy_pass   http://merginmaps-server:5000;
+     proxy_pass http://merginmaps-server:5000;
 
      # disable buffering
      client_max_body_size 0; # No maximum client body size
@@ -54,6 +53,8 @@ server {
 
    location /download/ {
      internal;
-     alias   /data/; # we need to mount data from mergin server here
+     # We need to mount data from mergin server here.
+     # This should have the same path as LOCAL_PROJECTS env variable with slash at the end
+     alias   /data/;
    }
  }

deployment/community/.env.template

@@ -1,7 +1,5 @@
 # This file should contain a set of Mergin Maps configuration definitions along with their default values
 
-# Mind that any major change to this file MUST BE reflected in docs
-
 
 FLASK_APP=application
 
@@ -22,9 +20,6 @@ MAINTENANCE_FILE=/data/MAINTENANCE
 #TEMP_DIR=gettempdir()  # trash dir for temp files being cleaned regularly
 TEMP_DIR=/data/tmp
 
-#VERSION=get_version()
-
-
 # Mergin DB related
 
 #DB_APPLICATION_NAME=mergin
@@ -117,11 +112,23 @@ MAIL_SUPPRESS_SEND=0
 
 #MAX_CHUNK_SIZE=10 * 1024 * 1024  # 10485760 in bytes
 
-#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024  # max total files size for archive download
+# data download
+
+#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024 * 10  # max total files size in bytes for archive download - 10 GB
 
 #USE_X_ACCEL=False  # use nginx (in front of gunicorn) to serve files (https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/)
 USE_X_ACCEL=1
 
+#PARTIAL_ZIP_EXPIRATION=600 # in seconds
+
+#PROJECTS_ARCHIVES_DIR=LOCAL_PROJECTS/projects_archives  # where to store archives for download
+
+# days for which archive is ready to download
+# PROJECTS_ARCHIVES_EXPIRATION=7 # in days
+
+# If use x-accel buffering by download (no/yes)
+# PROJECTS_ARCHIVES_X_ACCEL_BUFFERING="no"
+
 # geodif related
 
 # where geodiff lib copies working files

deployment/enterprise/.env.template

@@ -30,8 +30,6 @@ TEMP_DIR=/data/tmp
 
 #USER_SELF_REGISTRATION=True
 
-#VERSION=get_version()
-
 
 # Mergin DB related
 
@@ -108,10 +106,22 @@ MAIL_USERNAME=fix-me
 
 #MAX_CHUNK_SIZE=10 * 1024 * 1024  # 10485760 in bytes
 
-#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024  # max total files size for archive download
+# data download
+
+#MAX_DOWNLOAD_ARCHIVE_SIZE=1024 * 1024 * 1024  # max total files size in bytes for archive download
 
 #USE_X_ACCEL=False  # use nginx (in front of gunicorn) to serve files (https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/)
-USE_X_ACCEL=True
+USE_X_ACCEL=1
+
+#PARTIAL_ZIP_EXPIRATION=600 # in seconds
+
+#PROJECTS_ARCHIVES_DIR=LOCAL_PROJECTS/projects_archives  # where to store archives for download
+
+# days for which archive is ready to download
+# PROJECTS_ARCHIVES_EXPIRATION=7 # in days
+
+# If use x-accel buffering by download (no/yes)
+# PROJECTS_ARCHIVES_X_ACCEL_BUFFERING="no"
 
 # celery
 

development.md

@@ -68,12 +68,14 @@ If you want to run the whole stack locally, you can use the docker. Docker will
 # Enter community edition deployment folder
 cd deployment/community/
 
+# Create .prod.env file from .env.template
+cp .env.template .prod.env
+
 # Run the docker composition with the current Dockerfiles
 docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d
 
 # Give ownership of the ./projects folder to user that is running the gunicorn container
 sudo chown 901:999 projects
-sudo chown 101:999 logs
 
 # init db and create user
 docker exec -it merginmaps-server flask init-db

server/Pipfile

@@ -7,14 +7,13 @@ name = "pypi"
 connexion = {extras = ["swagger-ui"],version = "==2.14.1"}
 flask = "==2.2.5"
 python-dateutil = "==2.8.2"
+marshmallow = "==3.20.1"
 flask-marshmallow = "==0.14.0"
 marshmallow-sqlalchemy = "==1.1.0"
 psycopg2-binary = "==2.9.9"
 itsdangerous = "==2.2.0"
-requests-toolbelt = "==1.0.0"
 Flask-SQLAlchemy = "==2.5.1"
 sqlalchemy = "==1.4.53"
-zipfly = "==6.0.3"
 gunicorn = {extras = ["gevent"],version = "==19.9"}
 python-dotenv = "==0.20.0"
 flask-login = "==0.6.2"