Merge branch 'master' into eslint

2019-11-13 19:00:50 +01:00
parent 734c373f3d ccd01e6da5
commit 2c8a030ecb
21 changed files with 333 additions and 133 deletions
@@ -89,7 +89,12 @@ MapConfigNamedLayersAdapter.prototype.getMapConfig = function (user, requestMapC
                layers.push(layer);
                if (layersResult.datasource) {
                    datasourceBuilder.withLayerDatasource(currentLayerIndex, {
-                        user: dbAuth.dbuser
+                        user: dbAuth.dbuser,
+                            // Used internally (PSQL)
+                        pass: dbAuth.dbpassword,
+                        dbpassword: dbAuth.dbpassword,
+                            // Used by Mapnik
+                        password: dbAuth.dbpassword
                    });
                }
                currentLayerIndex++;