Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230072
Change subject: osm: various fixes
......................................................................
osm: various fixes
No reason to have 2 different ways to load the waterline data into the
database. Also no reason to depend the cron creation on anything. It's
execution is asynchronous to anything else.
Change-Id: Ib142045a39caef72f5f8d96d77b7ae6daac0559a
---
M modules/osm/manifests/import_waterlines.pp
1 file changed, 0 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/230072/1
diff --git a/modules/osm/manifests/import_waterlines.pp
b/modules/osm/manifests/import_waterlines.pp
index 1302f96..a88f1b5 100644
--- a/modules/osm/manifests/import_waterlines.pp
+++ b/modules/osm/manifests/import_waterlines.pp
@@ -16,16 +16,6 @@
content => template( 'osm/import_waterlines.erb' ),
}
- # Check if database exists
- $shapeline_exists = "/usr/bin/psql -d ${database} --tuples-only -c
\'SELECT table_name FROM information_schema.tables;\' | /bin/grep
\'water_polygons\'"
-
- exec { 'import_waterlines':
- command => '/usr/local/bin/import_waterlines',
- user => 'postgres',
- unless => $shapeline_exists,
- refreshonly => true,
- }
-
cron { 'import_waterlines':
ensure => present,
hour => 17,
@@ -33,6 +23,5 @@
weekday => 'Tue',
user => 'postgres',
command => '/usr/local/bin/import_waterlines',
- require => [File['/usr/local/bin/import_waterlines'], Class['osm']],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/230072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib142045a39caef72f5f8d96d77b7ae6daac0559a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
