Increase max size for diagnostic logs to 10MB

deployment/community/.env.template

@@ -1,17 +1,19 @@
 # This file should contain a set of Mergin Maps configuration definitions along with their default values
 
+# Required for access of your server from the internet in email links
+#MERGIN_BASE_URL=http://localhost:5000
+MERGIN_BASE_URL=fixme.example.com
 
-FLASK_APP=application
+# fixme: administrator email address for notifications and application initialisation
+CONTACT_EMAIL=admin@example.com
 
-# Required for access of your server
-#MERGIN_BASE_URL=http://localhost:5000
+# Flask application related
+
+FLASK_APP=application
 
 #DEBUG=FLASK_DEBUG | False
 FLASK_DEBUG=0
 
-#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
-LOCAL_PROJECTS=/data
-
 #MAINTENANCE_FILE=os.path.join(LOCAL_PROJECTS, 'MAINTENANCE')  # locking file when backups are created
 MAINTENANCE_FILE=/data/MAINTENANCE
 
@@ -104,6 +106,9 @@ MAIL_SUPPRESS_SEND=0
 
 # data sync
 
+#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
+LOCAL_PROJECTS=/data
+
 #BLACKLIST='.mergin/, .DS_Store, .directory'  # cast=Csv()
 
 #FILE_EXPIRATION=48 * 3600  # for clean up of old files where diffs were applied, in seconds

deployment/enterprise/.env.template

@@ -1,36 +1,32 @@
 # This file should contain a full set of Mergin Maps configuration
 # definitions along with their default values
 
-FLASK_APP=application
-GEODIFF_LOGGER_LEVEL=2
-CONTACT_EMAIL=fixme
+# Base URL of your deployment, required for access of your server from the internet in email links
+#MERGIN_BASE_URL=http://localhost:5000
+MERGIN_BASE_URL=fixme.example.com
 
+# fixme: administrator email address for notifications and application initialisation
+CONTACT_EMAIL=admin@example.com
 
-# ALL VERSIONS #########################################################################################################
+# Flask application related
 
-#DEBUG=FLASK_DEBUG | False
+FLASK_APP=application
+GEODIFF_LOGGER_LEVEL=2
 
-#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
-LOCAL_PROJECTS=/data
+#DEBUG=FLASK_DEBUG | False
 
 #MAINTENANCE_FILE=os.path.join(LOCAL_PROJECTS, 'MAINTENANCE')  # locking file when backups are created
 MAINTENANCE_FILE=/data/MAINTENANCE
 
 #PROXY_FIX=True
 
-#SECRET_KEY=NODEFAULT
-SECRET_KEY=fix-me
-
 #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
 
 #TESTING=False
 
-#USER_SELF_REGISTRATION=True
-
-
 # Mergin DB related
 
 #DB_APPLICATION_NAME=mergin
@@ -59,10 +55,20 @@ DB_PORT=5432
 
 # auth related
 
+#USER_SELF_REGISTRATION=True
+
+#SECRET_KEY=NODEFAULT
+SECRET_KEY=fixme
+
 #BEARER_TOKEN_EXPIRATION=3600 * 12  # in seconds
 
+#SECURITY_BEARER_SALT=NODEFAULT
 SECURITY_BEARER_SALT=fixme
+
+#SECURITY_EMAIL_SALT=NODEFAULT
 SECURITY_EMAIL_SALT=fixme
+
+#SECURITY_PASSWORD_SALT=NODEFAULT
 SECURITY_PASSWORD_SALT=fixme
 
 #WTF_CSRF_ENABLED=True
@@ -93,11 +99,14 @@ MAIL_SERVER=fixme
 #MAIL_USE_TLS=True
 
 #MAIL_USERNAME=NODEFAULT
-MAIL_USERNAME=fix-me
+MAIL_USERNAME=fixme
 
 
 # data sync
 
+#LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects')  # for local storage type
+LOCAL_PROJECTS=/data
+
 #BLACKLIST='.mergin/, .DS_Store, .directory'  # cast=Csv()
 
 #FILE_EXPIRATION=48 * 3600  # for clean up of old files where diffs were applied, in seconds

server/mergin/config.py

@@ -120,5 +120,5 @@ class Configuration(object):
         ),
     )
     DIAGNOSTIC_LOGS_MAX_SIZE = config(
-        "DIAGNOSTIC_LOGS_MAX_SIZE", default=1024 * 1024, cast=int
+        "DIAGNOSTIC_LOGS_MAX_SIZE", default=10 * 1024 * 1024, cast=int
     )