Skip to content
Snippets Groups Projects
Commit 211aaae1 authored by Ben Adida's avatar Ben Adida
Browse files

updates

parent 522576e8
No related branches found
No related tags found
No related merge requests found
app.yaml app.yaml
settings.py settings.py
initialization.py
*.pyc *.pyc
.DS_Store .DS_Store
*~ *~
\ No newline at end of file
...@@ -37,6 +37,9 @@ def main(): ...@@ -37,6 +37,9 @@ def main():
# Create a Django application for WSGI. # Create a Django application for WSGI.
application = django.core.handlers.wsgi.WSGIHandler() application = django.core.handlers.wsgi.WSGIHandler()
# if there's initialiation, run it
import initialization
# Run the WSGI CGI handler with that application. # Run the WSGI CGI handler with that application.
util.run_wsgi_app(application) util.run_wsgi_app(application)
......
Subproject commit d7e20746a289a57def46920c108931ecba7bae0b Subproject commit 45dc71e176ec0bd814f2b46f07ef6012d77dff75
"""
Initialization for the system
"""
import helios
import auth
import auth.models
#from single-election import glue
helios.TEMPLATE_BASE = "single-election/templates/base.html"
helios.ADMIN_ONLY = True
helios.ADMIN = auth.models.User.get_or_create(user_type = 'password', user_id = 'benadida', info={'password':'test'})
# authentication limited to passwords
auth.ENABLED_AUTH_SYSTEMS = ['cas', 'password']
auth.DEFAULT_AUTH_SYSTEM = 'cas'
...@@ -135,9 +135,9 @@ SINGLE_ELECTION_SHORT_NAME = 'FILL-ME-IN' ...@@ -135,9 +135,9 @@ SINGLE_ELECTION_SHORT_NAME = 'FILL-ME-IN'
SINGLE_ELECTION_PARAMS = { SINGLE_ELECTION_PARAMS = {
'short_name' : SINGLE_ELECTION_SHORT_NAME, 'short_name' : SINGLE_ELECTION_SHORT_NAME,
'name' : 'IACR 2009 Election', 'name' : SINGLE_ELECTION_TITLE,
'description' : 'Election for the IACR Board - 2009', 'description' : 'Election for the Fall 2009 Princeton Freshman Class Officers',
'uuid' : 'iacr', 'uuid' : SINGLE_ELECTION_UUID,
'openreg': False, 'openreg': False,
'tally_type': 'homomorphic', 'tally_type': 'homomorphic',
'ballot_type': 'homomorphic', 'ballot_type': 'homomorphic',
......
...@@ -2,16 +2,3 @@ ...@@ -2,16 +2,3 @@
This django app is meant only to connect the pieces of Helios and Auth that are specific to single election This django app is meant only to connect the pieces of Helios and Auth that are specific to single election
""" """
import glue
import helios
import auth
import auth.models
helios.TEMPLATE_BASE = "single-election/templates/base.html"
helios.ADMIN_ONLY = True
helios.ADMIN = auth.models.User.get_or_create(user_type = 'password', user_id = 'benadida', info={'password':'test'})
# authentication limited to passwords
auth.ENABLED_AUTH_SYSTEMS = ['cas', 'password']
auth.DEFAULT_AUTH_SYSTEM = 'cas'
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment