Dzahn has submitted this change and it was merged.
Change subject: qualify vars planet_domain_name, planet_languages
......................................................................
qualify vars planet_domain_name, planet_languages
Change-Id: I20bfbf49faa8a5065cb8b7453606cf9c47ee4ab1
---
M manifests/misc/planet.pp
M templates/apache/sites/planet-language.erb
M templates/apache/sites/planet.erb
M templates/planet/ar_config.erb
M templates/planet/ca_config.erb
M templates/planet/cs_config.erb
M templates/planet/de_config.erb
M templates/planet/en_config.erb
M templates/planet/es_config.erb
M templates/planet/fr_config.erb
M templates/planet/gmq_config.erb
M templates/planet/id_config.erb
M templates/planet/index.html.tmpl.erb
M templates/planet/it_config.erb
M templates/planet/ja_config.erb
M templates/planet/pl_config.erb
M templates/planet/pt_config.erb
M templates/planet/ro_config.erb
M templates/planet/ru_config.erb
M templates/planet/sr_config.erb
M templates/planet/uk_config.erb
M templates/planet/zh_config.erb
22 files changed, 40 insertions(+), 40 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/misc/planet.pp b/manifests/misc/planet.pp
index e48c3b7..37238a4 100644
--- a/manifests/misc/planet.pp
+++ b/manifests/misc/planet.pp
@@ -114,14 +114,14 @@
define planetapachesite {
file {
-
"/etc/apache2/sites-available/${title}.planet.${planet_domain_name}":
+
"/etc/apache2/sites-available/${title}.planet.${misc::planet-venus::planet_domain_name}":
mode => '0444',
owner => root,
group => root,
content => template('apache/sites/planet-language.erb');
}
- apache_site { "${title}-planet": name =>
"${title}.planet.${planet_domain_name}" }
+ apache_site { "${title}-planet": name =>
"${title}.planet.${misc::planet-venus::planet_domain_name}" }
}
# Apache site without language, redirects to meta
diff --git a/templates/apache/sites/planet-language.erb
b/templates/apache/sites/planet-language.erb
index e51cd30..6ae5477 100644
--- a/templates/apache/sites/planet-language.erb
+++ b/templates/apache/sites/planet-language.erb
@@ -2,7 +2,7 @@
<VirtualHost *:80>
DocumentRoot /var/www/planet/<%= @name %>
- ServerName <%= @name %>.planet.<%= planet_domain_name %>
+ ServerName <%= @name %>.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>
php_admin_flag engine off
<Directory /var/www/planet/<%= @name %>>
@@ -13,14 +13,14 @@
<VirtualHost *:443>
DocumentRoot /var/www/planet/<%= @name %>
- ServerName <%= @name %>.planet.<%= planet_domain_name %>
+ ServerName <%= @name %>.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/star.planet.<%= planet_domain_name
%>.pem
- SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
planet_domain_name %>.chained.pem
- SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
planet_domain_name %>.key
+ SSLCertificateFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.pem
+ SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.chained.pem
+ SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.key
<Directory /var/www/planet/<%= @name %>>
Allow from all
diff --git a/templates/apache/sites/planet.erb
b/templates/apache/sites/planet.erb
index 645c424..e2b4d50 100644
--- a/templates/apache/sites/planet.erb
+++ b/templates/apache/sites/planet.erb
@@ -2,14 +2,14 @@
# actual *.planet language versions are in planet-language.erb
<VirtualHost *:443>
- ServerName planet.<%= planet_domain_name %>
+ ServerName planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/star.planet.<%= planet_domain_name
%>.pem
- SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
planet_domain_name %>.chained.pem
- SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
planet_domain_name %>.key
+ SSLCertificateFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.pem
+ SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.chained.pem
+ SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>.key
RewriteEngine on
RewriteRule (.*) http://%{HTTP_HOST}%{REQUEST_URI} [R=301]
@@ -18,14 +18,14 @@
</VirtualHost>
<VirtualHost *:80>
- ServerName planet.<%= planet_domain_name %>
+ ServerName planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>
php_admin_flag engine off
DocumentRoot /var/www/planet
- Redirect /atom.xml http://en.planet.<%= planet_domain_name %>/atom.xml
- Redirect /rss10.xml http://en.planet.<%= planet_domain_name %>/rss10.xml
- Redirect /rss20.xml http://en.planet.<%= planet_domain_name %>/rss20.xml
+ Redirect /atom.xml http://en.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/atom.xml
+ Redirect /rss10.xml http://en.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/rss10.xml
+ Redirect /rss20.xml http://en.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/rss20.xml
RedirectTemp / http://meta.wikimedia.org/wiki/Planet_Wikimedia
</VirtualHost>
diff --git a/templates/planet/ar_config.erb b/templates/planet/ar_config.erb
index b6a8f1f..be3efb6 100644
--- a/templates/planet/ar_config.erb
+++ b/templates/planet/ar_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = ar.planet.wikimedia
-link = http://ar.planet.<%= planet_domain_name %>/
+link = http://ar.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/ar
diff --git a/templates/planet/ca_config.erb b/templates/planet/ca_config.erb
index b6836dc..4bcbef4 100644
--- a/templates/planet/ca_config.erb
+++ b/templates/planet/ca_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = ca.planet.wikimedia
-link = http://ca.planet.<%= planet_domain_name %>/
+link = http://ca.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/ca
diff --git a/templates/planet/cs_config.erb b/templates/planet/cs_config.erb
index 55b2018..be855f1 100644
--- a/templates/planet/cs_config.erb
+++ b/templates/planet/cs_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = cs.planet.wikimedia
-link = http://cs.planet.<%= planet_domain_name %>/
+link = http://cs.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/cs
diff --git a/templates/planet/de_config.erb b/templates/planet/de_config.erb
index af49ed6..5c3d6fc 100644
--- a/templates/planet/de_config.erb
+++ b/templates/planet/de_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = de.planet.wikimedia
-link = http://de.planet.<%= planet_domain_name %>/
+link = http://de.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/de
diff --git a/templates/planet/en_config.erb b/templates/planet/en_config.erb
index 5f7dcd8..11bfb06 100644
--- a/templates/planet/en_config.erb
+++ b/templates/planet/en_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = en.planet.wikimedia
-link = http://en.planet.<%= planet_domain_name %>/
+link = http://en.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/en
diff --git a/templates/planet/es_config.erb b/templates/planet/es_config.erb
index 5d28da2..d0327a9 100644
--- a/templates/planet/es_config.erb
+++ b/templates/planet/es_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = es.planet.wikimedia
-link = http://es.planet.<%= planet_domain_name %>/
+link = http://es.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/es
diff --git a/templates/planet/fr_config.erb b/templates/planet/fr_config.erb
index 5cd353c..1bd871c 100644
--- a/templates/planet/fr_config.erb
+++ b/templates/planet/fr_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = fr.planet.wikimedia
-link = http://fr.planet.<%= planet_domain_name %>/
+link = http://fr.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/fr
diff --git a/templates/planet/gmq_config.erb b/templates/planet/gmq_config.erb
index f855d33..0535c90 100644
--- a/templates/planet/gmq_config.erb
+++ b/templates/planet/gmq_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = gmq.planet.wikimedia
-link = http://gmq.planet.<%= planet_domain_name %>/
+link = http://gmq.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/gmq
diff --git a/templates/planet/id_config.erb b/templates/planet/id_config.erb
index bf59326..299d31d 100644
--- a/templates/planet/id_config.erb
+++ b/templates/planet/id_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = id.planet.wikimedia
-link = http://id.planet.<%= planet_domain_name %>/
+link = http://id.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/id
diff --git a/templates/planet/index.html.tmpl.erb
b/templates/planet/index.html.tmpl.erb
index 1a4647e..24116df 100644
--- a/templates/planet/index.html.tmpl.erb
+++ b/templates/planet/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><%= planet_languages[title]['subscribe'] %></h2>
+<h2><%=
scope.lookupvar('misc::planet-venus::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><%= planet_languages[title]['subscriptions'] %></h2>
+<h2><%=
scope.lookupvar('misc::planet-venus::planet_languages')[title]['subscriptions']
%></h2>
<ul>
<TMPL_LOOP Channels>
<li>
@@ -105,15 +105,15 @@
</ul>
<p>
-<strong><%= planet_languages[title]['lastupdated'] %></strong><br>
+<strong><%=
scope.lookupvar('misc::planet-venus::planet_languages')[title]['lastupdated']
%></strong><br>
<TMPL_VAR date><br>
-<em><%= planet_languages[title]['alltimesutc'] %></em><br>
+<em><%=
scope.lookupvar('misc::planet-venus::planet_languages')[title]['alltimesutc']
%></em><br>
<br>
-<%= planet_languages[title]['poweredby'] %><br>
+<%=
scope.lookupvar('misc::planet-venus::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><%= planet_languages[title]['wikimedia'] %></h2>
+<h2><%=
scope.lookupvar('misc::planet-venus::planet_languages')[title]['wikimedia']
%></h2>
<ul>
<li><a href="http://ar.planet.wikimedia.org/";>ar.planet.wm</a></li>
<li><a href="http://ca.planet.wikimedia.org/";>ca.planet.wm</a></li>
@@ -136,7 +136,7 @@
</ul>
</p>
<p>
-<h2><%= planet_languages[title]['planetarium'] %></h2>
+<h2><%=
scope.lookupvar('misc::planet-venus::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/templates/planet/it_config.erb b/templates/planet/it_config.erb
index 9badd01..db205e1 100644
--- a/templates/planet/it_config.erb
+++ b/templates/planet/it_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = it.planet.wikimedia
-link = http://it.planet.<%= planet_domain_name %>/
+link = http://it.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/it
diff --git a/templates/planet/ja_config.erb b/templates/planet/ja_config.erb
index a98c541..f289211 100644
--- a/templates/planet/ja_config.erb
+++ b/templates/planet/ja_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = ja.planet.wikimedia
-link = http://ja.planet.<%= planet_domain_name %>/
+link = http://ja.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/ja
diff --git a/templates/planet/pl_config.erb b/templates/planet/pl_config.erb
index f8f1832..fb4434b 100644
--- a/templates/planet/pl_config.erb
+++ b/templates/planet/pl_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = pl.planet.wikimedia
-link = http://pl.planet.<%= planet_domain_name %>/
+link = http://pl.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/pl
diff --git a/templates/planet/pt_config.erb b/templates/planet/pt_config.erb
index b506ae3..853c857 100644
--- a/templates/planet/pt_config.erb
+++ b/templates/planet/pt_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = pt.planet.wikimedia
-link = http://pt.planet.<%= planet_domain_name %>/
+link = http://pt.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/pt
diff --git a/templates/planet/ro_config.erb b/templates/planet/ro_config.erb
index 91732aa..cf999e1 100644
--- a/templates/planet/ro_config.erb
+++ b/templates/planet/ro_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = ro.planet.wikimedia
-link = http://ro.planet.<%= planet_domain_name %>/
+link = http://ro.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/ro
diff --git a/templates/planet/ru_config.erb b/templates/planet/ru_config.erb
index c3a25be..0f12842 100644
--- a/templates/planet/ru_config.erb
+++ b/templates/planet/ru_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = ru.planet.wikimedia
-link = http://ru.planet.<%= planet_domain_name %>/
+link = http://ru.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/ru
diff --git a/templates/planet/sr_config.erb b/templates/planet/sr_config.erb
index 95880e0..0269cab 100644
--- a/templates/planet/sr_config.erb
+++ b/templates/planet/sr_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = sr.planet.wikimedia
-link = http://sr.planet.<%= planet_domain_name %>/
+link = http://sr.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/sr
diff --git a/templates/planet/uk_config.erb b/templates/planet/uk_config.erb
index 8ca557e..3f06195 100644
--- a/templates/planet/uk_config.erb
+++ b/templates/planet/uk_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = uk.planet.wikimedia
-link = http://uk.planet.<%= planet_domain_name %>/
+link = http://uk.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/uk
diff --git a/templates/planet/zh_config.erb b/templates/planet/zh_config.erb
index 672a5ae..639cce7 100644
--- a/templates/planet/zh_config.erb
+++ b/templates/planet/zh_config.erb
@@ -11,7 +11,7 @@
[Planet]
name = zh.planet.wikimedia
-link = http://zh.planet.<%= planet_domain_name %>/
+link = http://zh.planet.<%=
scope.lookupvar('misc::planet-venus::planet_domain_name') %>/
owner_name = planet
owner_email = [email protected]
output_theme = /usr/share/planet-venus/theme/wikimedia/zh
--
To view, visit https://gerrit.wikimedia.org/r/96225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20bfbf49faa8a5065cb8b7453606cf9c47ee4ab1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
