Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
benadida committed Sep 12, 2009
1 parent 522576e commit 211aaae
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
app.yaml
settings.py
initialization.py
*.pyc
.DS_Store
*~
3 changes: 3 additions & 0 deletions django-gae.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
def main():
# Create a Django application for WSGI.
application = django.core.handlers.wsgi.WSGIHandler()

# if there's initialiation, run it
import initialization

# Run the WSGI CGI handler with that application.
util.run_wsgi_app(application)
Expand Down
2 changes: 1 addition & 1 deletion helios
19 changes: 19 additions & 0 deletions initialization.py.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"""
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'

6 changes: 3 additions & 3 deletions settings.py.sample
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ SINGLE_ELECTION_SHORT_NAME = 'FILL-ME-IN'

SINGLE_ELECTION_PARAMS = {
'short_name' : SINGLE_ELECTION_SHORT_NAME,
'name' : 'IACR 2009 Election',
'description' : 'Election for the IACR Board - 2009',
'uuid' : 'iacr',
'name' : SINGLE_ELECTION_TITLE,
'description' : 'Election for the Fall 2009 Princeton Freshman Class Officers',
'uuid' : SINGLE_ELECTION_UUID,
'openreg': False,
'tally_type': 'homomorphic',
'ballot_type': 'homomorphic',
Expand Down
13 changes: 0 additions & 13 deletions single-election/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,3 @@
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'

0 comments on commit 211aaae

Please sign in to comment.