[MediaWiki-commits] [Gerrit] planet: proxy through url-downloader to fetch URLs - change (operations/puppet)

[Dzahn (Code Review)]

Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/221036

Change subject: planet: proxy through url-downloader to fetch URLs
......................................................................

planet: proxy through url-downloader to fetch URLs

Now that planet is on a ganeti VM we can't directly fetch
the external feed URLs but have to proxy via url-downloader.wm.org
instead.

Bug:T101730
Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
---
M manifests/role/planet.pp
M modules/planet/manifests/cronjob.pp
M modules/planet/manifests/init.pp
3 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/221036/1

diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index e20af3d..c51bf11 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -191,11 +191,15 @@
     # protocol-relative link to a meta or index page for all planets
     $planet_meta_link = "meta.wikimedia.org/wiki/Planet_Wikimedia"
 
+    # since we are on Ganeti now we need to proxy to fetch external URLs
+    $planet_http_proxy="http://url-downloader.wikimedia.org:8080";
+
     # the 'planet' class from modules/planet/init.pp does the setup
     class {'::planet':
         planet_domain_name => $planet_domain_name,
         planet_languages   => $planet_languages,
-        planet_meta_link   => $planet_meta_link
+        planet_meta_link   => $planet_meta_link,
+        planet_http_proxy  => $planet_http_proxy
     }
 
     ferm::service { 'planet-http':
diff --git a/modules/planet/manifests/cronjob.pp 
b/modules/planet/manifests/cronjob.pp
index 423a8a9..c4c14fc 100644
--- a/modules/planet/manifests/cronjob.pp
+++ b/modules/planet/manifests/cronjob.pp
@@ -10,7 +10,7 @@
 
     cron { "update-${title}-planet":
         ensure  => 'present',
-        command => "${planet_bin} -v ${planet_config} > ${planet_logfile} 
2>&1",
+        command => "http_proxy=\"${planet_http_proxy}\" ${planet_bin} -v 
${planet_config} > ${planet_logfile} 2>&1",
         user    => 'planet',
         minute  => $minute,
         require => [
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 44a89bb..2673fb5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -16,7 +16,8 @@
 class planet (
     $planet_domain_name,
     $planet_languages,
-    $planet_meta_link
+    $planet_meta_link,
+    $planet_http_proxy,
 ) {
 
     # locales are essential for planet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3587178ea3ead8cd1b382fe401e0b99a7a676f1f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits