Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397729 )
Change subject: planet: missing Hiera, rename params, rm scope.lookup in erb ...................................................................... planet: missing Hiera, rename params, rm scope.lookup in erb Change-Id: If05cfb26d9980306b45de9d93aa930bda0efaac0 --- M hieradata/role/common/planet_server.yaml M modules/planet/manifests/apachesite.pp M modules/planet/manifests/config.pp M modules/planet/manifests/cronjob.pp M modules/planet/manifests/index_site.pp M modules/planet/manifests/init.pp M modules/planet/templates/apache/planet-language.erb M modules/planet/templates/apache/planet.erb M modules/planet/templates/feeds/ar_config.erb M modules/planet/templates/feeds/bg_config.erb M modules/planet/templates/feeds/cs_config.erb M modules/planet/templates/feeds/de_config.erb M modules/planet/templates/feeds/el_config.erb M modules/planet/templates/feeds/en_config.erb M modules/planet/templates/feeds/es_config.erb M modules/planet/templates/feeds/fr_config.erb M modules/planet/templates/feeds/gmq_config.erb M modules/planet/templates/feeds/id_config.erb M modules/planet/templates/feeds/it_config.erb M modules/planet/templates/feeds/pl_config.erb M modules/planet/templates/feeds/pt_config.erb M modules/planet/templates/feeds/ro_config.erb M modules/planet/templates/feeds/ru_config.erb M modules/planet/templates/feeds/sq_config.erb M modules/planet/templates/feeds/uk_config.erb M modules/planet/templates/feeds/zh_config.erb M modules/planet/templates/feeds_rawdog/plugins/rss.py.erb M modules/planet/templates/html/index.html.tmpl.erb M modules/planet/templates/html/rd_page.html.tmpl.erb M modules/profile/manifests/planet/venus.pp 30 files changed, 91 insertions(+), 75 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/role/common/planet_server.yaml b/hieradata/role/common/planet_server.yaml index 9b44b21..b649495 100644 --- a/hieradata/role/common/planet_server.yaml +++ b/hieradata/role/common/planet_server.yaml @@ -1,2 +1,4 @@ cluster: misc -planet_domain_name: 'wikimedia.org' +profile::planet::venus::domain_name: 'wikimedia.org' +profile::planet::venus::meta_link: 'meta.wikimedia.org/wiki/Planet_Wikimedia' +profile::planet::venus::http_proxy: "http://url-downloader.%{::site}.wikimedia.org:8080"; diff --git a/modules/planet/manifests/apachesite.pp b/modules/planet/manifests/apachesite.pp index 9d56219..608a7d9 100644 --- a/modules/planet/manifests/apachesite.pp +++ b/modules/planet/manifests/apachesite.pp @@ -1,5 +1,7 @@ # defined type: an apache site config for a planet-venus language version -define planet::apachesite { +define planet::apachesite ( + $domain_name = $domain_name, +){ if $title == 'en' { $priority = 10 @@ -7,7 +9,7 @@ $priority = 50 } - httpd::site { "${title}.planet.${planet::planet_domain_name}": + httpd::site { "${title}.planet.${domain_name}": content => template('planet/apache/planet-language.erb'), priority => $priority, } diff --git a/modules/planet/manifests/config.pp b/modules/planet/manifests/config.pp index fe0b269..abaede5 100644 --- a/modules/planet/manifests/config.pp +++ b/modules/planet/manifests/config.pp @@ -1,5 +1,7 @@ # defined type: a config dir and file for a planet-venus or rawdog language version -define planet::config { +define planet::config ( + $domain_name = $domain_name, +){ if os_version('debian >= stretch') { $config_path = '/etc/rawdog' diff --git a/modules/planet/manifests/cronjob.pp b/modules/planet/manifests/cronjob.pp index 41ee77e..fb6dd45 100644 --- a/modules/planet/manifests/cronjob.pp +++ b/modules/planet/manifests/cronjob.pp @@ -16,7 +16,7 @@ cron { "update-${title}-planet": ensure => 'present', - command => "http_proxy=\"${planet::planet_http_proxy}\" https_proxy=\$http_proxy ${planet_bin} ${planet_cmd} > ${planet_logfile} 2>&1", + command => "http_proxy=\"${planet::http_proxy}\" https_proxy=\$http_proxy ${planet_bin} ${planet_cmd} > ${planet_logfile} 2>&1", user => 'planet', minute => $minute, require => [ @@ -25,5 +25,4 @@ User['planet'], ], } - } diff --git a/modules/planet/manifests/index_site.pp b/modules/planet/manifests/index_site.pp index 5a14980..410cb96 100644 --- a/modules/planet/manifests/index_site.pp +++ b/modules/planet/manifests/index_site.pp @@ -1,7 +1,10 @@ # sets up the planet-venus index/portal site -class planet::index_site { +class planet::index_site ( + $domain_name, + $meta_link, +){ - httpd::site { "planet.${planet::planet_domain_name}": + httpd::site { "planet.${domain_name}": content => template('planet/apache/planet.erb'), } diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp index 7a3b9ac..84e0349 100644 --- a/modules/planet/manifests/init.pp +++ b/modules/planet/manifests/init.pp @@ -7,19 +7,19 @@ # # required parameters: # -# $planet_domain_name - domain name used in Apache/SSL configs +# $domain_name - domain name used in Apache/SSL configs # example "planet.wikimedia.org -# $planet_languages - a hash with languages and UI translations +# $languages - a hash with languages and UI translations # see the role class for this -# $planet_meta_link - a protocol relative link +# $meta_link - a protocol relative link # example: meta.wikimedia.org/wiki/Planet_Wikimedia -# $planet_http_proxy - set proxy to be used for downloading feeds +# $http_proxy - set proxy to be used for downloading feeds # example: http://url-downloader.${::site}.wikimedia.org:8080 class planet ( - $planet_domain_name, - $planet_languages, - $planet_meta_link, - $planet_http_proxy, + $domain_name, + $languages, + $meta_link, + $http_proxy, ) { # locales are essential for planet @@ -30,7 +30,11 @@ include ::planet::packages include ::planet::dirs include ::planet::user - include ::planet::index_site + + class { '::planet::index_site': + domain_name => $domain_name, + meta_link => $meta_link, + } if os_version('debian >= stretch') { $logo_file = '/var/www/planet/planet-wm2.png' @@ -48,25 +52,29 @@ # things done per each language version # we iterate over the keys of the hash # which includes language names and translations - $planet_languages_keys = keys($planet_languages) + $languages_keys = keys($languages) # creates one document root per language - planet::docroot { $planet_languages_keys: } + planet::docroot { $languages_keys: } # creates one Apache VirtualHost per language - planet::apachesite { $planet_languages_keys: } + planet::apachesite { $languages_keys: + domain_name => $domain_name, + } # creates one RSS/Atom feed config per language - planet::config { $planet_languages_keys: } + planet::config { $languages_keys: + domain_name => $domain_name, + } # creates one cron for updates per language - planet::cronjob { $planet_languages_keys: } + planet::cronjob { $languages_keys: } # creates one planet theme (css/logo) per language - planet::theme { $planet_languages_keys: } + planet::theme { $languages_keys: } if os_version('debian >= stretch') { # creates RSS dir and plugin per language - planet::rawdogplugin { $planet_languages_keys: } + planet::rawdogplugin { $languages_keys: } } } diff --git a/modules/planet/templates/apache/planet-language.erb b/modules/planet/templates/apache/planet-language.erb index c658620..376fb62 100644 --- a/modules/planet/templates/apache/planet-language.erb +++ b/modules/planet/templates/apache/planet-language.erb @@ -2,7 +2,7 @@ <VirtualHost *:80> DocumentRoot /var/www/planet/<%= @name %> - ServerName <%= @name %>.planet.<%= scope.lookupvar('planet::planet_domain_name') %> + ServerName <%= @name %>.planet.<%= @domain_name %> Header always set Content-Security-Policy "upgrade-insecure-requests" diff --git a/modules/planet/templates/apache/planet.erb b/modules/planet/templates/apache/planet.erb index 1a51b65..7f00ad0 100644 --- a/modules/planet/templates/apache/planet.erb +++ b/modules/planet/templates/apache/planet.erb @@ -2,14 +2,14 @@ # actual *.planet language versions are in planet-language.erb <VirtualHost *:80> - ServerName planet.<%= scope.lookupvar('planet::planet_domain_name') %> + ServerName planet.<%= @domain_name %> DocumentRoot /var/www/planet Header always set Content-Security-Policy "upgrade-insecure-requests" - Redirect /atom.xml https://en.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/atom.xml - Redirect /rss10.xml https://en.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/rss10.xml - Redirect /rss20.xml https://en.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/rss20.xml + Redirect /atom.xml https://en.planet.<%= @domain_name %>/atom.xml + Redirect /rss10.xml https://en.planet.<%= @domain_name %>/rss10.xml + Redirect /rss20.xml https://en.planet.<%= @domain_name %>/rss20.xml - RedirectTemp / https://<%= scope.lookupvar('planet::planet_meta_link') %> + RedirectTemp / https://<%= @meta_link %> </VirtualHost> diff --git a/modules/planet/templates/feeds/ar_config.erb b/modules/planet/templates/feeds/ar_config.erb index 7b20a19..54b13eb 100644 --- a/modules/planet/templates/feeds/ar_config.erb +++ b/modules/planet/templates/feeds/ar_config.erb @@ -11,7 +11,7 @@ [Planet] name = ar.planet.wikimedia -link = https://ar.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://ar.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/ar diff --git a/modules/planet/templates/feeds/bg_config.erb b/modules/planet/templates/feeds/bg_config.erb index 0542def..cbcc36d 100644 --- a/modules/planet/templates/feeds/bg_config.erb +++ b/modules/planet/templates/feeds/bg_config.erb @@ -11,7 +11,7 @@ [Planet] name = bg.planet.wikimedia -link = https://bg.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://bg.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/bg diff --git a/modules/planet/templates/feeds/cs_config.erb b/modules/planet/templates/feeds/cs_config.erb index f40d8fd..9b25b2d 100644 --- a/modules/planet/templates/feeds/cs_config.erb +++ b/modules/planet/templates/feeds/cs_config.erb @@ -11,7 +11,7 @@ [Planet] name = cs.planet.wikimedia -link = http://cs.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = http://cs.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/cs diff --git a/modules/planet/templates/feeds/de_config.erb b/modules/planet/templates/feeds/de_config.erb index b6d2671..4c659d6 100644 --- a/modules/planet/templates/feeds/de_config.erb +++ b/modules/planet/templates/feeds/de_config.erb @@ -11,7 +11,7 @@ [Planet] name = de.planet.wikimedia -link = https://de.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://de.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/de diff --git a/modules/planet/templates/feeds/el_config.erb b/modules/planet/templates/feeds/el_config.erb index 6ca19ee..19b6bde 100644 --- a/modules/planet/templates/feeds/el_config.erb +++ b/modules/planet/templates/feeds/el_config.erb @@ -11,7 +11,7 @@ [Planet] name = el.planet.wikimedia -link = https://el.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://el.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/el diff --git a/modules/planet/templates/feeds/en_config.erb b/modules/planet/templates/feeds/en_config.erb index 46e1df9..7d52c35 100644 --- a/modules/planet/templates/feeds/en_config.erb +++ b/modules/planet/templates/feeds/en_config.erb @@ -11,7 +11,7 @@ [Planet] name = en.planet.wikimedia -link = https://en.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://en.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/en diff --git a/modules/planet/templates/feeds/es_config.erb b/modules/planet/templates/feeds/es_config.erb index 8612c19..26533f3 100644 --- a/modules/planet/templates/feeds/es_config.erb +++ b/modules/planet/templates/feeds/es_config.erb @@ -11,7 +11,7 @@ [Planet] name = es.planet.wikimedia -link = https://es.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://es.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/es diff --git a/modules/planet/templates/feeds/fr_config.erb b/modules/planet/templates/feeds/fr_config.erb index 435b3af..a2ddb52 100644 --- a/modules/planet/templates/feeds/fr_config.erb +++ b/modules/planet/templates/feeds/fr_config.erb @@ -11,7 +11,7 @@ [Planet] name = fr.planet.wikimedia -link = https://fr.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://fr.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/fr diff --git a/modules/planet/templates/feeds/gmq_config.erb b/modules/planet/templates/feeds/gmq_config.erb index 44c36ac..5cd4d89 100644 --- a/modules/planet/templates/feeds/gmq_config.erb +++ b/modules/planet/templates/feeds/gmq_config.erb @@ -11,7 +11,7 @@ [Planet] name = gmq.planet.wikimedia -link = https://gmq.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://gmq.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/gmq diff --git a/modules/planet/templates/feeds/id_config.erb b/modules/planet/templates/feeds/id_config.erb index 429fbc9..b815524 100644 --- a/modules/planet/templates/feeds/id_config.erb +++ b/modules/planet/templates/feeds/id_config.erb @@ -11,7 +11,7 @@ [Planet] name = id.planet.wikimedia -link = https://id.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://id.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/id diff --git a/modules/planet/templates/feeds/it_config.erb b/modules/planet/templates/feeds/it_config.erb index 5e5abe6..a179f4b 100644 --- a/modules/planet/templates/feeds/it_config.erb +++ b/modules/planet/templates/feeds/it_config.erb @@ -11,7 +11,7 @@ [Planet] name = it.planet.wikimedia -link = https://it.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://it.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/it diff --git a/modules/planet/templates/feeds/pl_config.erb b/modules/planet/templates/feeds/pl_config.erb index ff7563f..15c7bce 100644 --- a/modules/planet/templates/feeds/pl_config.erb +++ b/modules/planet/templates/feeds/pl_config.erb @@ -11,7 +11,7 @@ [Planet] name = pl.planet.wikimedia -link = https://pl.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://pl.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/pl diff --git a/modules/planet/templates/feeds/pt_config.erb b/modules/planet/templates/feeds/pt_config.erb index 31b92d4..735ed30 100644 --- a/modules/planet/templates/feeds/pt_config.erb +++ b/modules/planet/templates/feeds/pt_config.erb @@ -11,7 +11,7 @@ [Planet] name = pt.planet.wikimedia -link = https://pt.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://pt.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/pt diff --git a/modules/planet/templates/feeds/ro_config.erb b/modules/planet/templates/feeds/ro_config.erb index cbdc0f1..fcce3ce 100644 --- a/modules/planet/templates/feeds/ro_config.erb +++ b/modules/planet/templates/feeds/ro_config.erb @@ -11,7 +11,7 @@ [Planet] name = ro.planet.wikimedia -link = https://ro.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://ro.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/ro diff --git a/modules/planet/templates/feeds/ru_config.erb b/modules/planet/templates/feeds/ru_config.erb index 786a693..2369ca8 100644 --- a/modules/planet/templates/feeds/ru_config.erb +++ b/modules/planet/templates/feeds/ru_config.erb @@ -11,7 +11,7 @@ [Planet] name = ru.planet.wikimedia -link = https://ru.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://ru.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/ru diff --git a/modules/planet/templates/feeds/sq_config.erb b/modules/planet/templates/feeds/sq_config.erb index 336632a..2c79f62 100644 --- a/modules/planet/templates/feeds/sq_config.erb +++ b/modules/planet/templates/feeds/sq_config.erb @@ -11,7 +11,7 @@ [Planet] name = sq.planet.wikimedia -link = https://sq.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://sq.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/sq diff --git a/modules/planet/templates/feeds/uk_config.erb b/modules/planet/templates/feeds/uk_config.erb index 29ea763..7317031 100644 --- a/modules/planet/templates/feeds/uk_config.erb +++ b/modules/planet/templates/feeds/uk_config.erb @@ -11,7 +11,7 @@ [Planet] name = uk.planet.wikimedia -link = https://uk.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://uk.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/uk diff --git a/modules/planet/templates/feeds/zh_config.erb b/modules/planet/templates/feeds/zh_config.erb index 7bb764b..606b5fa 100644 --- a/modules/planet/templates/feeds/zh_config.erb +++ b/modules/planet/templates/feeds/zh_config.erb @@ -11,7 +11,7 @@ [Planet] name = zh.planet.wikimedia -link = https://zh.planet.<%= scope.lookupvar('planet::planet_domain_name') %>/ +link = https://zh.planet.<%= @domain_name %>/ owner_name = planet owner_email = pla...@wikimedia.org output_theme = /usr/share/planet-venus/theme/wikimedia/zh diff --git a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb index 68734d2..fd5b93d 100644 --- a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb +++ b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb @@ -73,11 +73,11 @@ def __init__(self): self.options = { "outputxml": "rss20.xml", - "xmltitle": "Wikimedia Planet <% @planet_languages_keys %>", - "xmllink": "https://<% @planet_languages_keys %>.planet.wikimedia.org/", - "xmllanguage": "<% @planet_languages_keys %>", - "xmlurl": "https://<% @planet_languages_keys %>.planet.wikimedia.org/rss20.xml", - "xmldescription": "Wikimedia Planet <% @planet_languages_keys %> - https://<% @planet_languages_keys %>planet.wikimedia.org/", + "xmltitle": "Wikimedia Planet <% @languages_keys %>", + "xmllink": "https://<% @languages_keys %>.planet.wikimedia.org/", + "xmllanguage": "<% @languages_keys %>", + "xmlurl": "https://<% @languages_keys %>.planet.wikimedia.org/rss20.xml", + "xmldescription": "Wikimedia Planet <% @languages_keys %> - https://<% @languages_keys %>planet.wikimedia.org/", "xmlownername": "Wikimedia", "xmlowneremail": "", "xmlmaxarticles": "", diff --git a/modules/planet/templates/html/index.html.tmpl.erb b/modules/planet/templates/html/index.html.tmpl.erb index ff988bf..153bc58 100644 --- a/modules/planet/templates/html/index.html.tmpl.erb +++ b/modules/planet/templates/html/index.html.tmpl.erb @@ -89,13 +89,13 @@ <div class="sidebar"> <img src="images/planet-wm2.png" width="135" height="135" alt="Planet Wikimedia"> -<h2><%= scope.lookupvar('planet::planet_languages')[@title]['subscribe'] %></h2> +<h2><%= scope.lookupvar('planet::languages')[@title]['subscribe'] %></h2> <ul> <li> <a href="<TMPL_VAR feed ESCAPE="HTML">" title="<TMPL_VAR channel_title_plain ESCAPE="HTML">"><TMPL_VAR feedtype></a> </li> </ul> -<h2><%= scope.lookupvar('planet::planet_languages')[@title]['subscriptions'] %></h2> +<h2><%= scope.lookupvar('planet::languages')[@title]['subscriptions'] %></h2> <ul> <TMPL_LOOP Channels> <li> @@ -105,15 +105,15 @@ </ul> <p> -<strong><%= scope.lookupvar('planet::planet_languages')[@title]['lastupdated'] %></strong><br> +<strong><%= scope.lookupvar('planet::languages')[@title]['lastupdated'] %></strong><br> <TMPL_VAR date><br> -<em><%= scope.lookupvar('planet::planet_languages')[@title]['alltimesutc'] %></em><br> +<em><%= scope.lookupvar('planet::languages')[@title]['alltimesutc'] %></em><br> <br> -<%= scope.lookupvar('planet::planet_languages')[@title]['poweredby'] %><br> +<%= scope.lookupvar('planet::languages')[@title]['poweredby'] %><br> <a href="http://www.planetplanet.org/";><img src="images/planet.png" width="80" height="15" alt="Planet" border="0"></a> </p> <p> -<h2><%= scope.lookupvar('planet::planet_languages')[@title]['wikimedia'] %></h2> +<h2><%= scope.lookupvar('planet::languages')[@title]['wikimedia'] %></h2> <ul> <li><a href="http://ar.planet.wikimedia.org/";>ar.planet.wm</a></li> <li><a href="http://cs.planet.wikimedia.org/";>cs.planet.wm</a></li> @@ -134,7 +134,7 @@ </ul> </p> <p> -<h2><%= scope.lookupvar('planet::planet_languages')[@title]['planetarium'] %></h2> +<h2><%= scope.lookupvar('planet::languages')[@title]['planetarium'] %></h2> <ul> <li><a href="http://www.planetapache.org/";>Planet Apache</a></li> <li><a href="http://planet.debian.net/";>Planet Debian</a></li> diff --git a/modules/planet/templates/html/rd_page.html.tmpl.erb b/modules/planet/templates/html/rd_page.html.tmpl.erb index b7d08a0..dc2a3a1 100644 --- a/modules/planet/templates/html/rd_page.html.tmpl.erb +++ b/modules/planet/templates/html/rd_page.html.tmpl.erb @@ -130,13 +130,13 @@ </div> <div class="menu"> <p> - <h2><%= scope.lookupvar('planet::planet_languages')[@title]['subscribe'] %></h2> + <h2><%= scope.lookupvar('planet::languages')[@title]['subscribe'] %></h2> <ul> <li><a href="https://<%= @title %>.planet.wikimedia.org/rss20.xml">Atom</a></li> </ul> </p> <p> - <h2><%= scope.lookupvar('planet::planet_languages')[@title]['wikimedia'] %></h2> + <h2><%= scope.lookupvar('planet::languages')[@title]['wikimedia'] %></h2> <ul> <li><a href="https://ar.planet.wikimedia.org/";>ar.planet.wm</a></li> <li><a href="https://cs.planet.wikimedia.org/";>cs.planet.wm</a></li> @@ -157,7 +157,7 @@ </ul> </p> <p> - <h2><%= scope.lookupvar('planet::planet_languages')[@title]['planetarium'] %></h2> + <h2><%= scope.lookupvar('planet::languages')[@title]['planetarium'] %></h2> <ul> <li><a href="http://planet.apache.org/";>Planet Apache</a></li> <li><a href="http://planet.debian.net/";>Planet Debian</a></li> diff --git a/modules/profile/manifests/planet/venus.pp b/modules/profile/manifests/planet/venus.pp index 058b953..f3d78ad 100644 --- a/modules/profile/manifests/planet/venus.pp +++ b/modules/profile/manifests/planet/venus.pp @@ -1,20 +1,20 @@ # sets up a planet RSS feed aggregator (planet-venus aka planet 2.0) # -# $planet_domain_name: domain name used, e.g. wikimedia.org or wmflabs.org +# $domain_name: domain name used, e.g. wikimedia.org or wmflabs.org # -# $planet_meta_link: protocol-relative link to a meta or index page for all planets +# $meta_link: protocol-relative link to a meta or index page for all planets # -# $planet_http_proxy: since we are on a private IP now we need to proxy to fetch external URLs +# $http_proxy: since we are on a private IP now we need to proxy to fetch external URLs # -# $planet_languages: translated strings for the UI in various languages +# $languages: translated strings for the UI in various languages # list all planet languages and translations for index.html.tmpl here. # configurations, directories and cronjobs are auto-created from this hash. # class profile::planet::venus ( - $planet_domain_name = hiera('planet_domain_name'), - $planet_meta_link = 'meta.wikimedia.org/wiki/Planet_Wikimedia', - $planet_http_proxy = "http://url-downloader.${::site}.wikimedia.org:8080";, - $planet_languages = { + $domain_name = hiera('profile::planet::venus::domain_name'), + $meta_link = hiera('profile::planet::venus::meta_link'), + $http_proxy = hiera('profile::planet::venus::http_proxy'), + $languages = { ar => { 'subscribe' => 'اشترك', 'subscriptions' => 'الاشتراكات', @@ -184,10 +184,10 @@ ) { class {'::planet': - planet_domain_name => $planet_domain_name, - planet_languages => $planet_languages, - planet_meta_link => $planet_meta_link, - planet_http_proxy => $planet_http_proxy, + domain_name => $domain_name, + languages => $languages, + meta_link => $meta_link, + http_proxy => $http_proxy, } class {'::httpd': -- To view, visit https://gerrit.wikimedia.org/r/397729 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If05cfb26d9980306b45de9d93aa930bda0efaac0 Gerrit-PatchSet: 13 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
