Allow configuring qwc config schema

qwc-services · Aug 1, 2024 · 1beabcd · 1beabcd
1 parent 57b70b7
commit 1beabcd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 flask_login==0.6.3
 jsonschema==4.20.0
 psycopg2==2.9.9
-qwc-services-core==1.3.29
+qwc-services-core==1.3.30
 requests==2.32.0
 SQLAlchemy==2.0.29
 Flask==3.0.0

diff --git a/schemas/qwc-config-generator.json b/schemas/qwc-config-generator.json
@@ -49,6 +49,10 @@
           "type": "string",
           "format": "uri"
         },
+        "qwc_config_schema": {
+          "description": "The name of the DB schema which stores the qwc config. Default: qwc_config",
+          "type": "string"
+        },
         "default_qgis_server_url": {
           "description": "Default QGIS Server URL for OGC requests. Example: http://qwc-qgis-server/ows/",
           "type": "string",

diff --git a/src/config_generator/config_generator.py b/src/config_generator/config_generator.py
@@ -209,6 +209,7 @@ def __init__(self, config, logger, config_file_dir):
             os.environ.get(
                'OUTPUT_CONFIG_PATH', '/tmp/'
                ))
+        self.qwc_config_schema = generator_config.get('qwc_config_schema', 'qwc_config')
         self.tenant_path = os.path.join(self.config_path, self.tenant)
         self.logger.info("Config destination: '%s'" % self.tenant_path)
 
@@ -226,7 +227,10 @@ def __init__(self, config, logger, config_file_dir):
                 'config_db_url', 'postgresql:///?service=qwc_configdb'
             )
             db_engine = DatabaseEngine()
-            self.config_models = ConfigModels(db_engine, config_db_url)
+            self.config_models = ConfigModels(
+                db_engine, config_db_url,
+                qwc_config_schema=self.qwc_config_schema
+            )
         except Exception as e:
             msg = (
                 "Could not load ConfigModels for ConfigDB at '%s':\n%s" %