Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395671 )
Change subject: planet: Add stretch check in init.pp around rawdogplugin
......................................................................
planet: Add stretch check in init.pp around rawdogplugin
follows up 105b1b1ab7239caa3bf70345374d08b304629514
Change-Id: Iafa57318dc0a78cf65ab6f3629e2f851c3daaa8f
---
M modules/planet/manifests/init.pp
M modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index dfe7136..ab83558 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -65,7 +65,9 @@
# creates one planet theme (css/logo) per language
planet::theme { $planet_languages_keys: }
- # creates RSS dir and plugin per language
- planet::rawdogplugin { $planet_languages_keys: }
+ if os_version('debian >= stretch') {
+ # creates RSS dir and plugin per language
+ planet::rawdogplugin { $planet_languages_keys: }
+ }
}
diff --git a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
index 702a803..68734d2 100644
--- a/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
+++ b/modules/planet/templates/feeds_rawdog/plugins/rss.py.erb
@@ -1,6 +1,9 @@
# -*- coding: utf-8 -*-
#
# rawdog plugin to generate RSS, OPML and FOAF output
+# from
https://cgit.kde.org/websites/planet-kde-org.git/tree/planetkde/plugins/rss.py
+# and http://offog.org/git/rawdog-plugins/rss.py
+#
# Copyright 2008 Jonathan Riddell
# Copyright 2009 Adam Sampson <a...@offog.org>
# Copyright 2009 Kurt McKee <contac...@kurtmckee.org>
--
To view, visit https://gerrit.wikimedia.org/r/395671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafa57318dc0a78cf65ab6f3629e2f851c3daaa8f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
