Alexandros Kosiaris has submitted this change and it was merged.

Change subject: Fix planet sync cron command
......................................................................


Fix planet sync cron command

Percent signs need to be escaped

Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3
---
M modules/osm/manifests/planet_sync.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/osm/manifests/planet_sync.pp 
b/modules/osm/manifests/planet_sync.pp
index add6ff5..4bdf407 100644
--- a/modules/osm/manifests/planet_sync.pp
+++ b/modules/osm/manifests/planet_sync.pp
@@ -44,7 +44,7 @@
         content => template('osm/osmosis_configuration.txt.erb'),
     }
 
-    $sync_planet_cmd = inline_template("<%- [email protected](' '); 
multi={'MB' => 1, 'GB' => 1000}[data[1]]-%>/usr/bin/osmosis 
--read-replication-interval workingDirectory=<%= @osmosis_dir %> 
--simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C <%= 
data[0].to_i/10*multi %> --number-processes <%= @processorcount %> -e15 -o <%= 
@expire_dir %>/expire.list.$(date \"+%Y%m%d%H%M\") --append -")
+    $sync_planet_cmd = inline_template("<%- [email protected](' '); 
multi={'MB' => 1, 'GB' => 1000}[data[1]]-%>/usr/bin/osmosis 
--read-replication-interval workingDirectory=<%= @osmosis_dir %> 
--simplify-change --write-xml-change - | /usr/bin/osm2pgsql -k -s -C <%= 
data[0].to_i/10*multi %> --number-processes <%= @processorcount %> -e15 -o <%= 
@expire_dir %>/expire.list.$(date \"+\\%Y\\%m\\%d\\%H\\%M\") --append -")
     cron { "planet_sync-${name}":
         environment => "JAVACMD_OPTIONS='-Dhttp.proxyHost=webproxy.eqiad.wmnet 
-Dhttp.proxyPort=8080'",
         command => "$sync_planet_cmd > /tmp/osmosis.log 2>&1",

-- 
To view, visit https://gerrit.wikimedia.org/r/172521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2809b677ea9c948afd9671b81ed7abcc62d5b0b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to