From e6a0db0fe53a1525dc7002292e44898e9b8e5759 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Wed, 11 Aug 2010 14:36:32 -0700
Subject: [PATCH] updated for separation of url and secure url host

---
 auth               | 2 +-
 helios             | 2 +-
 settings.py.sample | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/auth b/auth
index 374a571..944391c 160000
--- a/auth
+++ b/auth
@@ -1 +1 @@
-Subproject commit 374a571a1585e14fab5f7a6673298535298f3bfb
+Subproject commit 944391c131ee718f475cbcb9dde4510582139b5c
diff --git a/helios b/helios
index d6f14f2..a7d6f30 160000
--- a/helios
+++ b/helios
@@ -1 +1 @@
-Subproject commit d6f14f265ddac65cc519c24b74c059c6ac6df724
+Subproject commit a7d6f30ff5d7a4d42342c1dbe5c87cc110c789b8
diff --git a/settings.py.sample b/settings.py.sample
index 94688ca..7612e15 100644
--- a/settings.py.sample
+++ b/settings.py.sample
@@ -104,7 +104,10 @@ SERVER_EMAIL = '%s <%s>' % (DEFAULT_FROM_NAME, DEFAULT_FROM_EMAIL)
 LOGIN_URL = '/auth/'
 LOGOUT_ON_CONFIRMATION = True
 
+# The two hosts are here so the main site can be over plain HTTP
+# while the voting URLs are served over SSL.
 URL_HOST = "http://localhost:8000"
+SECURE_URL_HOST = "https://localhost:8443"
 
 # election stuff
 SITE_TITLE = 'Helios Election Server'
-- 
GitLab