Install qgis-plugin-manager for server plugins

3liz · May 25, 2022 · 1d81e21 · 1d81e21
1 parent 9ce35b0
commit 1d81e21
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+* Use qgis-plugin-manager for installing qgis server plugins
+    - See https://github.com/3liz/qgis-plugin-manager
+* Support `QGIS_PLUGINPATH` environment variable
+* Add 'getfeaturelimit' config option
+    - Set maximum value for WFS/GetFeature requests
+
 ## 1.8.0 - 2022-05-16
 
 * Bump version 1.8 

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -24,13 +24,12 @@ RUN mkdir -p /opt/local/ \
     && /opt/local/pyqgisserver/bin/pip install --no-cache-dir $PIP_OPTIONS   \
         "py-qgis-server==${BUILD_VERSION}" \
         py-amqp-client \
+        qgis-plugin-manager \
     && ln -s /opt/local/pyqgisserver/bin/qgisserver \
     && ln -s /opt/local/pyqgisserver/bin/qgisserver-worker \
+    && ln -s /opt/local/pyqgisserver/bin/qgis-plugin-manager \
     && rm -rf /root/.cache /root/.ccache
 
-COPY install-lizmap-plugin /usr/local/bin/
-RUN chmod 0755 /usr/local/bin/install-lizmap-plugin
-
 COPY docker-entrypoint.sh /
 RUN chmod 0755 /docker-entrypoint.sh
 

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -60,6 +60,12 @@ fi
 export QGIS_DISABLE_MESSAGE_HOOKS=1
 export QGIS_NO_OVERRIDE_IMPORT=1
 
+# Make sure that QGSRV_SERVER_PLUGINPATH takes precedence over
+# QGIS_PLUGINPATH
+if [[ -n ${QGSRV_SERVER_PLUGINPATH} ]]; then
+    export QGIS_PLUGINPATH=$QGSRV_SERVER_PLUGINPATH
+fi
+
 if [[ "$1" == "qgisserver-worker" ]]; then
     shift
     echo "Running Qgis server worker"

diff --git a/docker/install-lizmap-plugin b/docker/install-lizmap-plugin
diff --git a/pyqgisserver/config.py b/pyqgisserver/config.py
@@ -65,7 +65,6 @@ def load_configuration():
     CONFIG.set('server', 'http_proxy'    , getenv('QGSRV_SERVER_HTTP_PROXY', 'no'))
     CONFIG.set('server', 'proxy_url'     , getenv('QGSRV_SERVER_PROXY_URL', ''))
     CONFIG.set('server', 'restartmon'    , getenv('QGSRV_SERVER_RESTARTMON', ''))
-    CONFIG.set('server', 'pluginpath'    , getenv('QGSRV_SERVER_PLUGINPATH', ''))
     CONFIG.set('server', 'ssl'           , getenv('QGSRV_SERVER_SSL', 'no'))
     CONFIG.set('server', 'ssl_cert'      , getenv('QGSRV_SERVER_SSL_CERT', ''))
     CONFIG.set('server', 'ssl_key'       , getenv('QGSRV_SERVER_SSL_KEY', ''))
@@ -75,7 +74,9 @@ def load_configuration():
     CONFIG.set('server', 'memory_high_water_mark', 
                getenv('QGSRV_SERVER_MEMORY_HIGH_WATER_MARK', '0.9'))
     CONFIG.set('server', 'getfeaturelimit', getenv('QGSRV_SERVER_GETFEATURELIMIT', '-1'))
-
+    CONFIG.set('server', 'pluginpath', 
+               getenv2('QGSRV_SERVER_PLUGINPATH','QGIS_PLUGINPATH', ''))
+
     #
     # Logging
     #