[geany/www.geany.org] e1e98e: Remove obsolete settings

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Fri, 21 Jun 2019 12:38:26 UTC
Commit:      e1e98ee04a7b4e479ca1d68fed34726cb8ac761a
             https://github.com/geany/www.geany.org/commit/e1e98ee04a7b4e479ca1d68fed34726cb8ac761a

Log Message:
-----------
Remove obsolete settings


Modified Paths:
--------------
    geany/settings.py
    geany/sitemaps.py

Modified: geany/settings.py
3 lines changed, 0 insertions(+), 3 deletions(-)
===================================================================
@@ -171,9 +171,6 @@
 SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 
 SITE_ID = 1
-SITE_DOMAIN_WWW = 'www.geany.org'
-SITE_DOMAIN_PASTEBIN = 'pastebin.geany.org'
-SITE_DOMAIN_NIGHTLY = 'nightly.geany.org'
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.


Modified: geany/sitemaps.py
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -155,7 +155,8 @@ def __init__(self):
     # ----------------------------------------------------------------------
     def add(self, generator_class, url_patterns, site_domain=None):
         if site_domain is None:
-            site_domain = settings.SITE_DOMAIN_WWW
+            site = Site.objects.get(id=settings.SITE_ID)
+            site_domain = site.domain
         sitemap_generator_item = (generator_class, url_patterns, site_domain)
         self._sitemap_generators.append(sitemap_generator_item)
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).