Merge lp:~widelands-dev/widelands-website/sitemap_https into lp:widelands-website

[kaputtnik]

sitemap.xml: explicitly set protocol to https

See commit message

[GunChleoc (gunchleoc)]

LGTM

review: Approve

[lp:~widelands-dev/widelands-website/sitemap_https]

546. By kaputtnik on 2019-07-28

merged trunk

547. By kaputtnik on 2019-07-28

use an own class for sitemaps https

548. By kaputtnik on 2019-07-28

codestyle

[kaputtnik (franku)]

This is online now: https://www.widelands.org/sitemap.xml/

=== modified file 'mainpage/sitemap_urls.py'
--- mainpage/sitemap_urls.py	2019-04-11 15:06:09 +0000
+++ mainpage/sitemap_urls.py	2019-07-28 12:21:26 +0000
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
 from django.contrib.sitemaps.views import sitemap
-from .static_sitemap import StaticViewSitemap
+from .sitemaps import StaticViewSitemap
 from wiki.sitemap import *
 from news.sitemap import *
 from pybb.sitemap import *

=== renamed file 'mainpage/static_sitemap.py' => 'mainpage/sitemaps.py'
--- mainpage/static_sitemap.py	2019-03-31 11:08:21 +0000
+++ mainpage/sitemaps.py	2019-07-28 12:21:26 +0000
@@ -2,7 +2,11 @@
 from django.urls import reverse
 
 
-class StaticViewSitemap(Sitemap):
+class SitemapHTTPS(Sitemap):
+    protocol = 'https'
+
+
+class StaticViewSitemap(SitemapHTTPS):
     priority = 0.5
     changefreq = 'yearly'
 

=== modified file 'news/sitemap.py'
--- news/sitemap.py	2016-12-13 18:28:51 +0000
+++ news/sitemap.py	2019-07-28 12:21:26 +0000
@@ -1,11 +1,11 @@
-from django.contrib.sitemaps import Sitemap
 from .models import Post
 from datetime import datetime
 from datetime import timedelta
-
-
-class NewsSitemap(Sitemap):
-    changefreq = 'never'
+from mainpage.sitemaps import SitemapHTTPS
+
+
+class NewsSitemap(SitemapHTTPS):
+    changefreq = 'yearly'
     priority = 0.5
 
     def items(self):

=== modified file 'pybb/sitemap.py'
--- pybb/sitemap.py	2016-11-04 08:07:18 +0000
+++ pybb/sitemap.py	2019-07-28 12:21:26 +0000
@@ -1,8 +1,8 @@
-from django.contrib.sitemaps import Sitemap
 from pybb.models import Forum
-
-
-class ForumSitemap(Sitemap):
+from mainpage.sitemaps import SitemapHTTPS
+
+
+class ForumSitemap(SitemapHTTPS):
     changefreq = 'monthly'
     priority = 0.5
 

=== modified file 'wiki/sitemap.py'
--- wiki/sitemap.py	2016-11-04 08:07:18 +0000
+++ wiki/sitemap.py	2019-07-28 12:21:26 +0000
@@ -1,8 +1,8 @@
-from django.contrib.sitemaps import Sitemap
 from wiki.models import Article
-
-
-class WikiSitemap(Sitemap):
+from mainpage.sitemaps import SitemapHTTPS
+
+
+class WikiSitemap(SitemapHTTPS):
     changefreq = 'yearly'
     priority = 0.5
 

=== modified file 'wlhelp/sitemap.py'
--- wlhelp/sitemap.py	2016-11-05 15:46:26 +0000
+++ wlhelp/sitemap.py	2019-07-28 12:21:26 +0000
@@ -1,8 +1,8 @@
-from django.contrib.sitemaps import Sitemap
 from wlhelp.models import Tribe, Building, Ware, Worker
-
-
-class WlHelpTribeSitemap(Sitemap):
+from mainpage.sitemaps import SitemapHTTPS
+
+
+class WlHelpTribeSitemap(SitemapHTTPS):
     changefreq = 'yearly'
     priority = 0.5
 
@@ -13,7 +13,7 @@
         return '/encyclopedia/%s' % obj.name
 
 
-class WlHelpBuildingSitemap(Sitemap):
+class WlHelpBuildingSitemap(SitemapHTTPS):
     changefreq = 'yearly'
     priority = 0.5
 
@@ -24,7 +24,7 @@
         return '/encyclopedia/%s/buildings/%s' % (obj.tribe.name, obj.name)
 
 
-class WlHelpWareSitemap(Sitemap):
+class WlHelpWareSitemap(SitemapHTTPS):
     changefreq = 'yearly'
     priority = 0.5
 
@@ -35,7 +35,7 @@
         return '/encyclopedia/%s/wares/%s' % (obj.tribe.name, obj.name)
 
 
-class WlHelpWorkerSitemap(Sitemap):
+class WlHelpWorkerSitemap(SitemapHTTPS):
     changefreq = 'yearly'
     priority = 0.5