Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/360990 )
Change subject: planet: fix "splitstate" option, config file name, icon
......................................................................
planet: fix "splitstate" option, config file name, icon
"splitstate yes" needs to be "splitstate true"
The config file can't end in .ini but needs to be just "config" (hrrm)
The icon should not belong to some random group "998".
Bug: T168490
Change-Id: I323a9367f2eaba441ee82f6030a1be4b6c0b374f
---
M modules/planet/manifests/config.pp
M modules/planet/manifests/init.pp
M modules/planet/templates/feeds_rawdog/ar_config.erb
M modules/planet/templates/feeds_rawdog/bg_config.erb
M modules/planet/templates/feeds_rawdog/cs_config.erb
M modules/planet/templates/feeds_rawdog/de_config.erb
M modules/planet/templates/feeds_rawdog/el_config.erb
M modules/planet/templates/feeds_rawdog/en_config.erb
M modules/planet/templates/feeds_rawdog/es_config.erb
M modules/planet/templates/feeds_rawdog/fr_config.erb
M modules/planet/templates/feeds_rawdog/gmq_config.erb
M modules/planet/templates/feeds_rawdog/id_config.erb
M modules/planet/templates/feeds_rawdog/it_config.erb
M modules/planet/templates/feeds_rawdog/pl_config.erb
M modules/planet/templates/feeds_rawdog/pt_config.erb
M modules/planet/templates/feeds_rawdog/ro_config.erb
M modules/planet/templates/feeds_rawdog/ru_config.erb
M modules/planet/templates/feeds_rawdog/sq_config.erb
M modules/planet/templates/feeds_rawdog/uk_config.erb
M modules/planet/templates/feeds_rawdog/zh_config.erb
20 files changed, 25 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/90/360990/1
diff --git a/modules/planet/manifests/config.pp
b/modules/planet/manifests/config.pp
index 1dc0a50..b3bfc14 100644
--- a/modules/planet/manifests/config.pp
+++ b/modules/planet/manifests/config.pp
@@ -3,9 +3,11 @@
if os_version('debian == stretch') {
$config_path = '/etc/rawdog'
+ $config_file = 'config'
$feed_src = 'feeds_rawdog'
} else {
$config_path = '/usr/share/planet-venus/wikimedia'
+ $config_file = 'config.ini'
$feed_src = 'feeds'
}
@@ -17,9 +19,9 @@
group => 'planet',
}
- file { "${config_path}/${title}/config.ini":
+ file { "${config_path}/${title}/${config_file}":
ensure => 'present',
- path => "${config_path}/${title}/config.ini",
+ path => "${config_path}/${title}/${config_file}",
owner => 'planet',
group => 'planet',
mode => '0444',
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 48cfaa0..7e25a73 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -42,7 +42,9 @@
# TODO change this to be one per language
file { $logo_file:
- source => 'puppet:///modules/planet/theme/images/planet-wm2.png';
+ source => 'puppet:///modules/planet/theme/images/planet-wm2.png';
+ owner => 'planet',
+ group => 'www-data',
}
# things done per each language version
diff --git a/modules/planet/templates/feeds_rawdog/ar_config.erb
b/modules/planet/templates/feeds_rawdog/ar_config.erb
index 897f7a7..1776a45 100644
--- a/modules/planet/templates/feeds_rawdog/ar_config.erb
+++ b/modules/planet/templates/feeds_rawdog/ar_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for ar.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/bg_config.erb
b/modules/planet/templates/feeds_rawdog/bg_config.erb
index 8510618..19e76e4 100644
--- a/modules/planet/templates/feeds_rawdog/bg_config.erb
+++ b/modules/planet/templates/feeds_rawdog/bg_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for bg.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/cs_config.erb
b/modules/planet/templates/feeds_rawdog/cs_config.erb
index 9952544..961661b 100644
--- a/modules/planet/templates/feeds_rawdog/cs_config.erb
+++ b/modules/planet/templates/feeds_rawdog/cs_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for cs.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/de_config.erb
b/modules/planet/templates/feeds_rawdog/de_config.erb
index 41ae560..7d21a9c 100644
--- a/modules/planet/templates/feeds_rawdog/de_config.erb
+++ b/modules/planet/templates/feeds_rawdog/de_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for de.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/el_config.erb
b/modules/planet/templates/feeds_rawdog/el_config.erb
index c13b73e..32542e4 100644
--- a/modules/planet/templates/feeds_rawdog/el_config.erb
+++ b/modules/planet/templates/feeds_rawdog/el_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for el.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/en_config.erb
b/modules/planet/templates/feeds_rawdog/en_config.erb
index 790c288..7c78ec0 100644
--- a/modules/planet/templates/feeds_rawdog/en_config.erb
+++ b/modules/planet/templates/feeds_rawdog/en_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for en.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/es_config.erb
b/modules/planet/templates/feeds_rawdog/es_config.erb
index 24432a1..10f6d55 100644
--- a/modules/planet/templates/feeds_rawdog/es_config.erb
+++ b/modules/planet/templates/feeds_rawdog/es_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for es.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/fr_config.erb
b/modules/planet/templates/feeds_rawdog/fr_config.erb
index feb65fa..fd57c8e 100644
--- a/modules/planet/templates/feeds_rawdog/fr_config.erb
+++ b/modules/planet/templates/feeds_rawdog/fr_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for fr.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/gmq_config.erb
b/modules/planet/templates/feeds_rawdog/gmq_config.erb
index 5ea9550..c3aa36c 100644
--- a/modules/planet/templates/feeds_rawdog/gmq_config.erb
+++ b/modules/planet/templates/feeds_rawdog/gmq_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for gmq.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/id_config.erb
b/modules/planet/templates/feeds_rawdog/id_config.erb
index 5a19ccd..1e42344 100644
--- a/modules/planet/templates/feeds_rawdog/id_config.erb
+++ b/modules/planet/templates/feeds_rawdog/id_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for id.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/it_config.erb
b/modules/planet/templates/feeds_rawdog/it_config.erb
index f69ac6f..b74b1bd 100644
--- a/modules/planet/templates/feeds_rawdog/it_config.erb
+++ b/modules/planet/templates/feeds_rawdog/it_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for it.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/pl_config.erb
b/modules/planet/templates/feeds_rawdog/pl_config.erb
index 2f16d1b..34d304c 100644
--- a/modules/planet/templates/feeds_rawdog/pl_config.erb
+++ b/modules/planet/templates/feeds_rawdog/pl_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for pl.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/pt_config.erb
b/modules/planet/templates/feeds_rawdog/pt_config.erb
index 07097ee..0860de7 100644
--- a/modules/planet/templates/feeds_rawdog/pt_config.erb
+++ b/modules/planet/templates/feeds_rawdog/pt_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for pt.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/ro_config.erb
b/modules/planet/templates/feeds_rawdog/ro_config.erb
index fb44a78..34a69b5 100644
--- a/modules/planet/templates/feeds_rawdog/ro_config.erb
+++ b/modules/planet/templates/feeds_rawdog/ro_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for ro.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/ru_config.erb
b/modules/planet/templates/feeds_rawdog/ru_config.erb
index 4daed68..9ee0613 100644
--- a/modules/planet/templates/feeds_rawdog/ru_config.erb
+++ b/modules/planet/templates/feeds_rawdog/ru_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for ru.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/sq_config.erb
b/modules/planet/templates/feeds_rawdog/sq_config.erb
index 122e674..312c6a8 100644
--- a/modules/planet/templates/feeds_rawdog/sq_config.erb
+++ b/modules/planet/templates/feeds_rawdog/sq_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for sq.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/uk_config.erb
b/modules/planet/templates/feeds_rawdog/uk_config.erb
index 3cc1c0c..30e4791 100644
--- a/modules/planet/templates/feeds_rawdog/uk_config.erb
+++ b/modules/planet/templates/feeds_rawdog/uk_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for uk.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
diff --git a/modules/planet/templates/feeds_rawdog/zh_config.erb
b/modules/planet/templates/feeds_rawdog/zh_config.erb
index 9e79009..769ae4c 100644
--- a/modules/planet/templates/feeds_rawdog/zh_config.erb
+++ b/modules/planet/templates/feeds_rawdog/zh_config.erb
@@ -1,7 +1,7 @@
# rawdog config file for zh.planet
plugindirs plugins
-splitstate yes
+splitstate true
maxarticles 200
maxage 0
expireage 7d
--
To view, visit https://gerrit.wikimedia.org/r/360990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I323a9367f2eaba441ee82f6030a1be4b6c0b374f
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
