Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87524
Change subject: retab from tabs to 4 spaces
......................................................................
retab from tabs to 4 spaces
Change-Id: I1c8112398676ac2026ff20f7eee261e46a50f996
---
M manifests/role/planet.pp
1 file changed, 112 insertions(+), 112 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/87524/1
diff --git a/manifests/role/planet.pp b/manifests/role/planet.pp
index 04e277f..86048e8 100644
--- a/manifests/role/planet.pp
+++ b/manifests/role/planet.pp
@@ -2,123 +2,123 @@
class role::planet {
- system_role { "role::planet": description => "Planet (venus) weblog
aggregator" }
+ system_role { "role::planet": description => "Planet (venus) weblog
aggregator" }
- # locales are essential for planet. if a new language is added check
these too
- include standard,
- generic::locales::international
+ # locales are essential for planet. if a new language is added check these
too
+ include standard,
+ generic::locales::international
- # be flexible about labs vs. prod
- case $::realm {
- 'labs': {
- $planet_domain_name = 'wmflabs.org'
- }
- 'production': {
- $planet_domain_name = 'wikimedia.org'
- }
- 'default': {
- fail('unknown realm, should be labs or production')
- }
- }
+ # be flexible about labs vs. prod
+ case $::realm {
+ 'labs': {
+ $planet_domain_name = 'wmflabs.org'
+ }
+ 'production': {
+ $planet_domain_name = 'wikimedia.org'
+ }
+ 'default': {
+ fail('unknown realm, should be labs or production')
+ }
+ }
- # webserver setup
- install_certificate{ "star.planet.${planet_domain_name}": }
- class {'webserver::php5': ssl => true; }
- apache_module { 'rewrite': name => 'rewrite' }
- apache_module { 'expires': name => 'expires' }
+ # webserver setup
+ install_certificate{ "star.planet.${planet_domain_name}": }
+ class {'webserver::php5': ssl => true; }
+ apache_module { 'rewrite': name => 'rewrite' }
+ apache_module { 'expires': name => 'expires' }
- # dependencies
- Class['webserver::php5'] -> apache_module["rewrite"] ->
Install_certificate["star.planet.${planet_domain_name}"]
+ # dependencies
+ Class['webserver::php5'] -> apache_module["rewrite"] ->
Install_certificate["star.planet.${planet_domain_name}"]
- # List all planet languages and translations for
- # index.html.tmpl here. Configurations, directories and
- # cronjobs are auto-created from this hash.
- $planet_languages = {
- ar => {
- 'subscribe' => 'اشترك',
- 'subscriptions' => 'الاشتراكات',
- 'lastupdated' => 'اخر تحديث',
- },
- ca => {
- 'subscribe' => 'Subscriure\'s',
- 'subscriptions' => 'Subscripcions',
- 'lastupdated' => 'Última actualització',
- },
- cs => {
- 'subscribe' => 'Přihlásit odběr',
- 'subscriptions' => 'Odběry',
- 'lastupdated' => 'Poslední aktualizace',
- },
- de => {
- 'subscribe' => 'Abonnieren',
- 'subscriptions' => 'Teilnehmer',
- 'lastupdated' => 'Zuletzt aktualisiert',
- },
- en => {
- 'subscribe' => 'Subscribe',
- 'subscriptions' => 'Subscriptions',
- 'lastupdated' => 'Last updated',
- },
- es => { 'subscribe' => 'Suscribirse',
- 'subscriptions' => 'Suscripciones',
- 'lastupdated' => 'Última actualización',
- },
- fr => {
- 'subscribe' => 'S\'abonner',
- 'subscriptions' => 'Abonnements',
- 'lastupdated' => 'Dernière mise à jour',
- },
- gmq => {
- 'subscribe' => 'Abonnér',
- 'subscriptions' => 'Abonnementer',
- 'lastupdated' => 'Senest opdateret',
- },
- it => {
- 'subscribe' => 'Abbonati',
- 'subscriptions' => 'Sottoscrizioni',
- 'lastupdated' => 'Last updated',
- },
- ja => {
- 'subscribe' => 'Subscribe',
- 'subscriptions' => 'Subscriptions',
- 'lastupdated' => 'Last updated',
- },
- pl => {
- 'subscribe' => 'Subskrybuj',
- 'subscriptions' => 'Subskrypcje',
- 'lastupdated' => 'Ostatnia zmiana',
- },
- pt => {
- 'subscribe' => 'Subscrever',
- 'subscriptions' => 'Subcrições',
- 'lastupdated' => 'Última actualização',
- },
- ro => {
- 'subscribe' => 'Abonare',
- 'subscriptions' => 'Abonări',
- 'lastupdated' => 'Ultima actualizare',
- },
- ru => {
- 'subscribe' => 'Подписаться',
- 'subscriptions' => 'Подписки',
- 'lastupdated' => 'Последнее обновление',
- },
- sr => {
- 'subscribe' => 'Subscribe',
- 'subscriptions' => 'Subscriptions',
- 'lastupdated' => 'Last updated',
- },
- zh => {
- 'subscribe' => '訂閱',
- 'subscriptions' => '收錄',
- 'lastupdated' => '最近更新'
- },
- }
+ # List all planet languages and translations for
+ # index.html.tmpl here. Configurations, directories and
+ # cronjobs are auto-created from this hash.
+ $planet_languages = {
+ ar => {
+ 'subscribe' => 'اشترك',
+ 'subscriptions' => 'الاشتراكات',
+ 'lastupdated' => 'اخر تحديث',
+ },
+ ca => {
+ 'subscribe' => 'Subscriure\'s',
+ 'subscriptions' => 'Subscripcions',
+ 'lastupdated' => 'Última actualització',
+ },
+ cs => {
+ 'subscribe' => 'Přihlásit odběr',
+ 'subscriptions' => 'Odběry',
+ 'lastupdated' => 'Poslední aktualizace',
+ },
+ de => {
+ 'subscribe' => 'Abonnieren',
+ 'subscriptions' => 'Teilnehmer',
+ 'lastupdated' => 'Zuletzt aktualisiert',
+ },
+ en => {
+ 'subscribe' => 'Subscribe',
+ 'subscriptions' => 'Subscriptions',
+ 'lastupdated' => 'Last updated',
+ },
+ es => { 'subscribe' => 'Suscribirse',
+ 'subscriptions' => 'Suscripciones',
+ 'lastupdated' => 'Última actualización',
+ },
+ fr => {
+ 'subscribe' => 'S\'abonner',
+ 'subscriptions' => 'Abonnements',
+ 'lastupdated' => 'Dernière mise à jour',
+ },
+ gmq => {
+ 'subscribe' => 'Abonnér',
+ 'subscriptions' => 'Abonnementer',
+ 'lastupdated' => 'Senest opdateret',
+ },
+ it => {
+ 'subscribe' => 'Abbonati',
+ 'subscriptions' => 'Sottoscrizioni',
+ 'lastupdated' => 'Last updated',
+ },
+ ja => {
+ 'subscribe' => 'Subscribe',
+ 'subscriptions' => 'Subscriptions',
+ 'lastupdated' => 'Last updated',
+ },
+ pl => {
+ 'subscribe' => 'Subskrybuj',
+ 'subscriptions' => 'Subskrypcje',
+ 'lastupdated' => 'Ostatnia zmiana',
+ },
+ pt => {
+ 'subscribe' => 'Subscrever',
+ 'subscriptions' => 'Subcrições',
+ 'lastupdated' => 'Última actualização',
+ },
+ ro => {
+ 'subscribe' => 'Abonare',
+ 'subscriptions' => 'Abonări',
+ 'lastupdated' => 'Ultima actualizare',
+ },
+ ru => {
+ 'subscribe' => 'Подписаться',
+ 'subscriptions' => 'Подписки',
+ 'lastupdated' => 'Последнее обновление',
+ },
+ sr => {
+ 'subscribe' => 'Subscribe',
+ 'subscriptions' => 'Subscriptions',
+ 'lastupdated' => 'Last updated',
+ },
+ zh => {
+ 'subscribe' => '訂閱',
+ 'subscriptions' => '收錄',
+ 'lastupdated' => '最近更新'
+ },
+ }
- # the actual planet-venus class doing all the rest
- class {'misc::planet-venus':
- planet_domain_name => $planet_domain_name,
- planet_languages => $planet_languages,
- }
+ # the actual planet-venus class doing all the rest
+ class {'misc::planet-venus':
+ planet_domain_name => $planet_domain_name,
+ planet_languages => $planet_languages,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/87524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c8112398676ac2026ff20f7eee261e46a50f996
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
