diff --git a/doc/integrator/backend_qgis.rst b/doc/integrator/backend_qgis.rst index e950dd8276..03073162a9 100644 --- a/doc/integrator/backend_qgis.rst +++ b/doc/integrator/backend_qgis.rst @@ -169,22 +169,6 @@ and the configuration should be as follows: * WFS support: recommended to be ``[X]`` * Is single tile: recommended to be ``[ ]`` -Access Restriction -****************** - -The access restriction is available only for Docker projects. - -We provide a Docker image named ``camptocamp/geomapfish-qgisserver`` with tag pattern: -``gmf``. - -The configuration that use the ``QGIS_PROJECT_FILE`` or ``GEOMAPFISH_ACCESSCONTROL_CONFIG`` are still -working but are deprecated. Project in Database ******************* @@ -214,6 +198,37 @@ in the vars file add: With that you will not have URL encoding issues. + +Access Restrictions +=================== + +The access restriction functionality described here is available only for Docker projects. + +We provide a Docker image named ``camptocamp/geomapfish-qgisserver`` with tag pattern: +``gmf[-gdal]``. + + +Access Restriction on QGIS OGC server +************************************* + +From version 2.7 the config is just made with the ``GEOMAPFISH_ACCESSCONTROL_BASE_URL`` environment +variable which contains the base URL of the OGC servers, by default it's set to +``QGISSERVER_URL``. And the plugin will search for the OGC servers that match with this base URL. +It also requires that the OGC servers are configured with an URL like that +``config://qgisserver?map=``. + +The configuration that use the ``QGIS_PROJECT_FILE`` or ``GEOMAPFISH_ACCESSCONTROL_CONFIG`` are still +working but are deprecated. + + +Protecting Attributes +********************* + +Individual attributes can be protected via the layer metadata setting ``protectedAttributes``. To define which roles shall +have access, the functionality ``allowed_attributes`` must be used in combination with this setting. As WMS layer name, +the actual (exposed) WMS layer name must be used in this configuration. + + Landing page ============ diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/.CONST_vars.yaml.swp b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/.CONST_vars.yaml.swp new file mode 100644 index 0000000000..fcc8865889 Binary files /dev/null and b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/.CONST_vars.yaml.swp differ diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml index 412393c7ae..e34d671c56 100644 --- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml +++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml @@ -778,7 +778,7 @@ vars: - name: protectedAttributes type: list description: > - For QGIS server: List of attribute names that's protected, to be used with the `allowed_attributes` functionality. + For QGIS server: List of attribute names that are protected, to be used with the `allowed_attributes` functionality. relevant_for: - layer_wms # WMTS layers