edited indices an setup file to grant select for table country_osm_grid

diff --git a/sql/indices.src.sql b/sql/indices.src.sql
index a04bc05de1938813ac7050193c7c5c80ff13a023..cd09c9bf419ad91404af7d1b61c46cf15f2a1be7 100644 (file)
--- a/sql/indices.src.sql
+++ b/sql/indices.src.sql
@@ -21,7 +21,7 @@ CREATE INDEX idx_placex_geometry_reverse_placeNode_rank_search ON placex USING g
 osm_type = 'N' and rank_search > 0 and rank_search <= 25 and class = 'place' and type != 'postcode' and name is not null and indexed_status = 0 and linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_placeNode_rank_address ON placex USING gist (geometry) {ts:search-index} where
 osm_type = 'N' and rank_address > 0 and rank_address <= 25 and type != 'postcode' and name is not null and indexed_status = 0 and linked_place_id is null;
-GRANT SELECT ON Table country_osm_grid to "www-data";
+GRANT SELECT ON Table country_osm_grid to "{www-user}";
 
 CREATE INDEX idx_location_area_country_place_id ON location_area_country USING BTREE (place_id) {ts:address-index};
 

diff --git a/utils/setup.php b/utils/setup.php
index 259ddf2df139589b09efbd55ed4d12353b35c922..4925a4e5b0bef4a30d5a859b17d25535fa487be2 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -596,6 +596,7 @@ if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;
 
     $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+    $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
     $sTemplate = replace_tablespace(
         '{ts:address-index}',
         CONST_Tablespace_Address_Index,