diff --git a/auth b/auth index 374a571a1585e14fab5f7a6673298535298f3bfb..944391c131ee718f475cbcb9dde4510582139b5c 160000 --- a/auth +++ b/auth @@ -1 +1 @@ -Subproject commit 374a571a1585e14fab5f7a6673298535298f3bfb +Subproject commit 944391c131ee718f475cbcb9dde4510582139b5c diff --git a/helios b/helios index d6f14f265ddac65cc519c24b74c059c6ac6df724..a7d6f30ff5d7a4d42342c1dbe5c87cc110c789b8 160000 --- a/helios +++ b/helios @@ -1 +1 @@ -Subproject commit d6f14f265ddac65cc519c24b74c059c6ac6df724 +Subproject commit a7d6f30ff5d7a4d42342c1dbe5c87cc110c789b8 diff --git a/settings.py.sample b/settings.py.sample index 94688ca53d548db9ebd36801c873330dac0b218f..7612e15a39885eb44a45410f3c07f7903c9d252e 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'