Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389692 )
Change subject: planet: rawdog, use one global config for all langs ...................................................................... planet: rawdog, use one global config for all langs Instead of repeating config settings in each language template, use a single global config file for most settings except the actual feed URLs and pathes and then include it in each individual config file. Changes like I4e972ae263b131615 will only need to change ONE place after this. Also raise number of threads to 4 (like I0c18c79b710db5 but 4 vs 3) Change-Id: I0c18c79b710db5fc775a0b2b068fc2ca0cefe6dd --- M modules/planet/manifests/dirs.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 A modules/planet/templates/feeds_rawdog/global.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, 98 insertions(+), 703 deletions(-) Approvals: Paladox: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/planet/manifests/dirs.pp b/modules/planet/manifests/dirs.pp index 84bbe22..7862f6d 100644 --- a/modules/planet/manifests/dirs.pp +++ b/modules/planet/manifests/dirs.pp @@ -16,6 +16,14 @@ mode => '0755', } + file { '/etc/rawdog/config': + ensure => 'present', + mode => '0444', + owner => 'planet', + group => 'planet', + content => template('planet/feeds_rawdog/global.erb') + } + } else { file { [ diff --git a/modules/planet/templates/feeds_rawdog/ar_config.erb b/modules/planet/templates/feeds_rawdog/ar_config.erb index 2ce9f8b..c6003c2 100644 --- a/modules/planet/templates/feeds_rawdog/ar_config.erb +++ b/modules/planet/templates/feeds_rawdog/ar_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for ar.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Arabic language (ar.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/ar/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ar/rd_item.tmpl - outputfile /var/www/planet/ar/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://khalidyousif.wordpress.com/tag/wiki/feed/atom/ feed 1h https://osamak.wordpress.com/category/wikipedia/feed/atom/ diff --git a/modules/planet/templates/feeds_rawdog/bg_config.erb b/modules/planet/templates/feeds_rawdog/bg_config.erb index 40b42ac..beef04c 100644 --- a/modules/planet/templates/feeds_rawdog/bg_config.erb +++ b/modules/planet/templates/feeds_rawdog/bg_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for bg.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Bulgarian language (bg.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/bg/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/bg/rd_item.tmpl - outputfile /var/www/planet/bg/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://blog.wikimedia.bg/feed/ feed 1h https://vodnokon4e-asen33.blogspot.it/feeds/posts/default/-/%D0%A3%D0%B8%D0%BA%D0%B8%D0%BF%D0%B5%D0%B4%D0%B8%D1%8F/ diff --git a/modules/planet/templates/feeds_rawdog/cs_config.erb b/modules/planet/templates/feeds_rawdog/cs_config.erb index 2f5a2a2..2ef2056 100644 --- a/modules/planet/templates/feeds_rawdog/cs_config.erb +++ b/modules/planet/templates/feeds_rawdog/cs_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for cs.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Czech language (cs.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/cs/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/cs/rd_item.tmpl - outputfile /var/www/planet/cs/index.html -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list feed 1h https://blog.wikimedia.cz/feed/atom/ feed 1h https://wikipediste.blogspot.com/feeds/posts/default diff --git a/modules/planet/templates/feeds_rawdog/de_config.erb b/modules/planet/templates/feeds_rawdog/de_config.erb index 9f72303..e67df1e 100644 --- a/modules/planet/templates/feeds_rawdog/de_config.erb +++ b/modules/planet/templates/feeds_rawdog/de_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for de.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in German language (de.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/de/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/de/rd_item.tmpl - outputfile /var/www/planet/de/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://arnomane.wordpress.com/category/wiki-de/feed/atom/ #feed 1h https://www.wikimedia.ch/archives/category/de/feed diff --git a/modules/planet/templates/feeds_rawdog/el_config.erb b/modules/planet/templates/feeds_rawdog/el_config.erb index 46808d6..638f6ca 100644 --- a/modules/planet/templates/feeds_rawdog/el_config.erb +++ b/modules/planet/templates/feeds_rawdog/el_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for el.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Greek language (el.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/el/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/el/rd_item.tmpl - outputfile /var/www/planet/el/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://magioladitis.blogspot.com/feeds/posts/default feed 1h https://blog.wikimedia.gr/feed/ diff --git a/modules/planet/templates/feeds_rawdog/en_config.erb b/modules/planet/templates/feeds_rawdog/en_config.erb index e0a9c6b..2f33476 100644 --- a/modules/planet/templates/feeds_rawdog/en_config.erb +++ b/modules/planet/templates/feeds_rawdog/en_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for en.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in English language (en.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/en/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/en/rd_item.tmpl - outputfile /var/www/planet/en/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h http://medicalfuturist.com/tag/wikipedia/feed/ feed 1h https://brionv.com/log/feed/ diff --git a/modules/planet/templates/feeds_rawdog/es_config.erb b/modules/planet/templates/feeds_rawdog/es_config.erb index 86ba072..dc3b673 100644 --- a/modules/planet/templates/feeds_rawdog/es_config.erb +++ b/modules/planet/templates/feeds_rawdog/es_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for es.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Spanish language (es.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/es/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/es/rd_item.tmpl - outputfile /var/www/planet/es/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://rataube.blogspot.com/feeds/posts/default/-/wikipedia feed 1h https://diariowiki.blogspot.com/feeds/posts/default diff --git a/modules/planet/templates/feeds_rawdog/fr_config.erb b/modules/planet/templates/feeds_rawdog/fr_config.erb index 2be1245..f711ea1 100644 --- a/modules/planet/templates/feeds_rawdog/fr_config.erb +++ b/modules/planet/templates/feeds_rawdog/fr_config.erb @@ -1,47 +1,9 @@ -# rawdog config file for fr.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in French language (fr.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/fr/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/fr/rd_item.tmpl - -feeditemtemplate default - outputfile /var/www/planet/fr/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://referencenecessaire.wordpress.com/feed/atom/ feed 1h http://www.anthere.org/dotclear/?feed/rss2 diff --git a/modules/planet/templates/feeds_rawdog/global.erb b/modules/planet/templates/feeds_rawdog/global.erb new file mode 100644 index 0000000..206ec3d --- /dev/null +++ b/modules/planet/templates/feeds_rawdog/global.erb @@ -0,0 +1,37 @@ +# global config for rawdog feeds +# shared among all language versions + +plugindirs plugins +splitstate true +maxarticles 200 +maxage 0 +expireage 7d +keepmin 20 +currentonly false +daysections true + +dayformat %A, %d %B +timesections true +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B + +userefresh true +showfeeds true + +numthreads 4 +timeout 30s + +ignoretimeouts false +showtracebacks false +verbose false + +blocklevelhtml true +tidyhtml true +sortbyfeeddate true +useids true + +hideduplicates id +newfeedperiod 3h + +changeconfig false + diff --git a/modules/planet/templates/feeds_rawdog/gmq_config.erb b/modules/planet/templates/feeds_rawdog/gmq_config.erb index 14f09b0..d2be174 100644 --- a/modules/planet/templates/feeds_rawdog/gmq_config.erb +++ b/modules/planet/templates/feeds_rawdog/gmq_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for gmq.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in North Germanic languages (gmq.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/gmq/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/gmq/rd_item.tmpl - outputfile /var/www/planet/gmq/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h http://blog.desainali.com/category/wikipedia/feed/ feed 1h https://calandrella.wordpress.com/tag/wikipedia/feed/atom/ diff --git a/modules/planet/templates/feeds_rawdog/id_config.erb b/modules/planet/templates/feeds_rawdog/id_config.erb index aa2c5cf..4651afe 100644 --- a/modules/planet/templates/feeds_rawdog/id_config.erb +++ b/modules/planet/templates/feeds_rawdog/id_config.erb @@ -1,44 +1,8 @@ -# rawdog config file for id.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Indonesian language (id.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/id/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/id/rd_item.tmpl - outputfile /var/www/planet/id/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://ivanlanin.wordpress.com/category/wikipedia/feed/ diff --git a/modules/planet/templates/feeds_rawdog/it_config.erb b/modules/planet/templates/feeds_rawdog/it_config.erb index 996f715..3135465 100644 --- a/modules/planet/templates/feeds_rawdog/it_config.erb +++ b/modules/planet/templates/feeds_rawdog/it_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for it.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Italian language (it.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/it/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/it/rd_item.tmpl - outputfile /var/www/planet/it/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# #feed 1h http://appuntisui.polsini.net/?cat=11 feed 1h http://appuntisui.polsini.net/?feed=rss2&cat=11 diff --git a/modules/planet/templates/feeds_rawdog/pl_config.erb b/modules/planet/templates/feeds_rawdog/pl_config.erb index 8d40fb4..43da7f3 100644 --- a/modules/planet/templates/feeds_rawdog/pl_config.erb +++ b/modules/planet/templates/feeds_rawdog/pl_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for pl.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Polish language (pl.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/pl/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/pl/rd_item.tmpl - outputfile /var/www/planet/pl/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://wojnax.blogspot.com/feeds/posts/default feed 1h https://feeds.feedburner.com/adas_wiki?format=xml diff --git a/modules/planet/templates/feeds_rawdog/pt_config.erb b/modules/planet/templates/feeds_rawdog/pt_config.erb index 962eadc..09c7778 100644 --- a/modules/planet/templates/feeds_rawdog/pt_config.erb +++ b/modules/planet/templates/feeds_rawdog/pt_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for pt.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Portuguese language (pt.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/pt/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/pt/rd_item.tmpl - outputfile /var/www/planet/pt/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://feeds.feedburner.com/Rei-artur_planetwikimedia feed 1h https://wikificacoes.blogspot.com/atom.xml diff --git a/modules/planet/templates/feeds_rawdog/ro_config.erb b/modules/planet/templates/feeds_rawdog/ro_config.erb index ec940b1..c35f024 100644 --- a/modules/planet/templates/feeds_rawdog/ro_config.erb +++ b/modules/planet/templates/feeds_rawdog/ro_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for ro.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Romanian language (ro.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/ro/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ro/rd_item.tmpl - outputfile /var/www/planet/ro/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://www.strainu.ro/category/projects/wikipedia-projects/feed/ feed 1h https://promitt.wordpress.com/category/wikipedia/feed/atom/ diff --git a/modules/planet/templates/feeds_rawdog/ru_config.erb b/modules/planet/templates/feeds_rawdog/ru_config.erb index e0cfeaf..5babedc 100644 --- a/modules/planet/templates/feeds_rawdog/ru_config.erb +++ b/modules/planet/templates/feeds_rawdog/ru_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for ru.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Russian language (ru.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/ru/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ru/rd_item.tmpl - outputfile /var/www/planet/ru/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h http://vikivestnik.livejournal.com/data/rss feed 1h http://wikipedia-blog.livejournal.com/data/rss/ diff --git a/modules/planet/templates/feeds_rawdog/sq_config.erb b/modules/planet/templates/feeds_rawdog/sq_config.erb index 7156afb..600a7f7 100644 --- a/modules/planet/templates/feeds_rawdog/sq_config.erb +++ b/modules/planet/templates/feeds_rawdog/sq_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for sq.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Albanian language (sq.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/sq/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/sq/rd_item.tmpl - outputfile /var/www/planet/sq/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://gretadoci.wordpress.com/category/home/feed/ feed 1h https://elioqoshi.me/sq/tag/wiki-sq/feed/ diff --git a/modules/planet/templates/feeds_rawdog/uk_config.erb b/modules/planet/templates/feeds_rawdog/uk_config.erb index ea26284..40d5a52 100644 --- a/modules/planet/templates/feeds_rawdog/uk_config.erb +++ b/modules/planet/templates/feeds_rawdog/uk_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for uk.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Ukrainian language (uk.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/uk/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/uk/rd_item.tmpl - outputfile /var/www/planet/uk/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://wikimediaukraine.wordpress.com/feed/ feed 1h http://wikilovesearth.org.ua/feed/ diff --git a/modules/planet/templates/feeds_rawdog/zh_config.erb b/modules/planet/templates/feeds_rawdog/zh_config.erb index a216f51..3d9d7f5 100644 --- a/modules/planet/templates/feeds_rawdog/zh_config.erb +++ b/modules/planet/templates/feeds_rawdog/zh_config.erb @@ -1,45 +1,9 @@ -# rawdog config file for zh.planet - -plugindirs plugins -splitstate true -maxarticles 200 -maxage 0 -expireage 7d -keepmin 20 -currentonly false -daysections true - -dayformat %A, %d %B -timesections true -timeformat %I:%M %p -datetimeformat %H:%M, %A, %d %B - +# planet rawdog feeds in Chinese language (zh.planet.wikimedia.org) +include ../config template /etc/rawdog/theme/wikimedia/zh/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/zh/rd_item.tmpl - outputfile /var/www/planet/zh/index.html - -userefresh true -showfeeds true - -numthreads 3 -timeout 30s - -ignoretimeouts false -showtracebacks false -verbose false - -blocklevelhtml true -tidyhtml true -sortbyfeeddate true -useids true - -hideduplicates id -newfeedperiod 3h - -changeconfig false - -# the actual feed list +# feed 1h https://kevinhksouth.blogspot.com/feeds/posts/default feed 1h http://blog.roodo.com/kwangyin/archives/cat_380215.xml -- To view, visit https://gerrit.wikimedia.org/r/389692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c18c79b710db5fc775a0b2b068fc2ca0cefe6dd Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits