Gehel has submitted this change and it was merged.
Change subject: maps - osm-initial-import fixes
......................................................................
maps - osm-initial-import fixes
Fixes issues encountered:
* creation of water_polygons table
* fix postgresql grant issue
Bug: T138092
Change-Id: I23ea24e36de9e5ff512e8e551d9be5d9e7377970
---
M modules/osm/templates/import_waterlines.erb
M modules/role/files/maps/osm-initial-import
2 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
Gehel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/osm/templates/import_waterlines.erb
b/modules/osm/templates/import_waterlines.erb
index d0a73fd..94149a8 100644
--- a/modules/osm/templates/import_waterlines.erb
+++ b/modules/osm/templates/import_waterlines.erb
@@ -1,9 +1,18 @@
#!/bin/bash
set -e
+
+if [ "${1}" == "create" ]; then
+ SHP2PGSQL_OPERATION="-c"
+ TRANSFORMATION=""
+else
+ SHP2PGSQL_OPERATION="-a"
+ TRANSFORMATION='/^BEGIN;$/aTRUNCATE water_polygons;'
+fi
+
cd /srv/downloads
curl -O <%= @proxy_opt %>
http://data.openstreetmapdata.com/water-polygons-split-3857.zip
unzip water-polygons-split-3857.zip
rm water-polygons-split-3857.zip
-shp2pgsql -a -s 3857:900913 -g way
water-polygons-split-3857/water_polygons.shp water_polygons | sed
'/^BEGIN;$/aTRUNCATE water_polygons;' | psql <%= @database %>
+shp2pgsql ${SHP2PGSQL_OPERATION} -s 3857:900913 -g way
water-polygons-split-3857/water_polygons.shp water_polygons | sed
"${TRANSFORMATION}" | psql <%= @database %>
rm -rf water-polygons-split-3857
diff --git a/modules/role/files/maps/osm-initial-import
b/modules/role/files/maps/osm-initial-import
index e207aa9..5f8183b 100644
--- a/modules/role/files/maps/osm-initial-import
+++ b/modules/role/files/maps/osm-initial-import
@@ -101,7 +101,7 @@
function import_water_lines() {
echo "starting water line import"
- sudo -u osmupdater /usr/local/bin/import_waterlines
+ sudo -u osmupdater /usr/local/bin/import_waterlines create
echo "water line import completed"
}
@@ -137,5 +137,7 @@
initial_osm_import
import_water_lines
custom_functions_and_indexes
+# ensure grants again as some other tables have been created
+ensure_sql_grants
replicate_osm
cleanup
--
To view, visit https://gerrit.wikimedia.org/r/303816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23ea24e36de9e5ff512e8e551d9be5d9e7377970
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
