Skip to content
Permalink
Browse files

Update environment variable name

  • Loading branch information
pblottiere committed Aug 27, 2020
1 parent d601f93 commit 32f9b352b5e5db28d8b0910a6b91bfef68f1ef73
Showing with 7 additions and 7 deletions.
  1. +4 −4 src/server/qgsserversettings.cpp
  2. +3 −3 src/server/qgsserversettings.h
@@ -243,7 +243,7 @@ void QgsServerSettings::initSettings()
mSettings[ sApiWfs3MaxLimit.envVar ] = sApiWfs3MaxLimit;

// projects directory for landing page service
const Setting sProjectsDirectories = { QgsServerSettingsEnv::QGIS_SERVER_PROJECTS_DIRECTORIES,
const Setting sProjectsDirectories = { QgsServerSettingsEnv::QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES,
QgsServerSettingsEnv::DEFAULT_VALUE,
QStringLiteral( "Directories used by the landing page service to find .qgs and .qgz projects" ),
QStringLiteral( "/qgis/server_projects_directories" ),
@@ -255,7 +255,7 @@ void QgsServerSettings::initSettings()
mSettings[ sProjectsDirectories.envVar ] = sProjectsDirectories;

// postgresql connection string for landing page service
const Setting sProjectsPgConnections = { QgsServerSettingsEnv::QGIS_SERVER_PROJECTS_PG_CONNECTIONS,
const Setting sProjectsPgConnections = { QgsServerSettingsEnv::QGIS_SERVER_LANDING_PAGE_PROJECTS_PG_CONNECTIONS,
QgsServerSettingsEnv::DEFAULT_VALUE,
QStringLiteral( "PostgreSQL connection strings used by the landing page service to find projects" ),
QStringLiteral( "/qgis/server_projects_pg_connections" ),
@@ -477,12 +477,12 @@ int QgsServerSettings::wmsMaxWidth() const

QString QgsServerSettings::projectsDirectories() const
{
return value( QgsServerSettingsEnv::QGIS_SERVER_PROJECTS_DIRECTORIES, true ).toString();
return value( QgsServerSettingsEnv::QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES, true ).toString();
}

QString QgsServerSettings::projectsPgConnections() const
{
return value( QgsServerSettingsEnv::QGIS_SERVER_PROJECTS_PG_CONNECTIONS, true ).toString();
return value( QgsServerSettingsEnv::QGIS_SERVER_LANDING_PAGE_PROJECTS_PG_CONNECTIONS, true ).toString();
}

QString QgsServerSettings::apiResourcesDirectory() const
@@ -69,9 +69,9 @@ class SERVER_EXPORT QgsServerSettingsEnv : public QObject
QGIS_SERVER_API_RESOURCES_DIRECTORY, //!< Base directory where HTML templates and static assets (e.g. images, js and css files) are searched for (since QGIS 3.10).
QGIS_SERVER_API_WFS3_MAX_LIMIT, //!< Maximum value for "limit" in a features request, defaults to 10000 (since QGIS 3.10).
QGIS_SERVER_TRUST_LAYER_METADATA, //!< Trust layer metadata. Improves project read time. (since QGIS 3.16).
QGIS_SERVER_DISABLE_GETPRINT //!< Disabled WMS GetPrint request and don't load layouts. Improves project read time. (since QGIS 3.16).
QGIS_SERVER_PROJECTS_DIRECTORIES, //!< Directories used by the landing page service to find .qgs and .qgz projects (since QGIS 3.16)
QGIS_SERVER_PROJECTS_PG_CONNECTIONS //!< PostgreSQL connection strings used by the landing page service to find projects (since QGIS 3.16)
QGIS_SERVER_DISABLE_GETPRINT, //!< Disabled WMS GetPrint request and don't load layouts. Improves project read time. (since QGIS 3.16).
QGIS_SERVER_LANDING_PAGE_PROJECTS_DIRECTORIES, //!< Directories used by the landing page service to find .qgs and .qgz projects (since QGIS 3.16)
QGIS_SERVER_LANDING_PAGE_PROJECTS_PG_CONNECTIONS //!< PostgreSQL connection strings used by the landing page service to find projects (since QGIS 3.16)
};
Q_ENUM( EnvVar )
};

0 comments on commit 32f9b35

Please sign in to comment.
You can’t perform that action at this time.