Merge branch 'archweb' into archweb-generic

2 files changed, 6 insertions, 4 deletions

diff --git a/public/tests.py b/public/tests.py
index 565d57ec..aaf5f847 100644
--- a/public/tests.py
+++ b/public/tests.py
@@ -19,13 +19,13 @@ class PublicTest(TestCase):
         response = self.client.get('/svn/')
         self.assertEqual(response.status_code, 200)
 
-    def test_developers(self):
+    def test_developers_old(self):
         response = self.client.get('/developers/')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 301)
 
-    def test_fellows(self):
+    def test_fellows_old(self):
         response = self.client.get('/fellows/')
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 301)
 
     def test_donate(self):
         response = self.client.get('/donate/')
diff --git a/public/views.py b/public/views.py
index 7dd0528c..910b6c2d 100644
--- a/public/views.py
+++ b/public/views.py
@@ -25,10 +25,12 @@ def index(request):
     else:
         def updates():
             return get_recent_updates()
+    domain = "%s://%s" % (request.scheme, request.META.get('HTTP_HOST'))
     context = {
         'news_updates': News.objects.order_by('-postdate', '-id')[:15],
         'pkg_updates': updates,
         'staff_groups': StaffGroup.objects.all(),
+        'domain': domain,
     }
     return render(request, 'public/index.html', context)