From c564f155115fd1158fd03bee450502b35de0057d 2020-01-24 17:26:59
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2020-01-24 17:26:59
Subject: [PATCH] Correct & update hard-coded domain names from legacy codebase.

---

diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py
index 85dea531bbd62a0ccd1ef98b63b39e46a07db0ac..942e97a3a71f21e4e0777164587c03bf955ee1c6 100644
--- a/www/conservancy/apps/blog/models.py
+++ b/www/conservancy/apps/blog/models.py
@@ -60,9 +60,9 @@ class Entry(models.Model, bsoup.SoupModelMixin):
             super(Entry, self).save()
             return
 
-        blog_name = 'Software Freedom Law Center Blog'
-        blog_url =  'http://www.softwarefreedom.org/blog/'
-        post_url = ('http://www.softwarefreedom.org'
+        blog_name = 'Software Freedom Conservancy Blog'
+        blog_url =  'http://www.sfconservancy.org/blog/'
+        post_url = ('http://www.sfconservancy.org'
                     + self.get_absolute_url())
 
         import xmlrpclib
diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py
index 4fc5e3d93e5c8053fffc44afcbef0d6cc10aebfe..ef916360c52441d1b4557b3a3ff739b3d2015cef 100644
--- a/www/conservancy/apps/news/models.py
+++ b/www/conservancy/apps/news/models.py
@@ -48,9 +48,9 @@ class PressRelease(models.Model, bsoup.SoupModelMixin):
             super(PressRelease, self).save()
             return
 
-        blog_name = 'Software Freedom Law Center News'
-        blog_url =  'http://www.softwarefreedom.org/news/'
-        post_url = ('http://www.softwarefreedom.org'
+        blog_name = 'Software Freedom Conservancy News'
+        blog_url =  'https://www.sfconservancy.org/news/'
+        post_url = ('https://www.sfconservancy.org'
                     + self.get_absolute_url())
 
         import xmlrpclib
diff --git a/www/conservancy/templates/feeds/blog_description.html b/www/conservancy/templates/feeds/blog_description.html
index 4912c87ce8de616848f13c2a698ed856cf1f6021..56ed092561cae08c0d1cbfbaaf17f86496db2f91 100644
--- a/www/conservancy/templates/feeds/blog_description.html
+++ b/www/conservancy/templates/feeds/blog_description.html
@@ -1,2 +1,2 @@
-<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@softwarefreedom.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
+<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@sfconservancy.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
 {{ obj.body|safe }}