Skip to content

Commit

Permalink
Revert "Move the WSGI application to a separate directory"
Browse files Browse the repository at this point in the history
This reverts commit ab17403.

(The commit should have contained the move of `wsgi.py` to its
own directory, not the other stuff. Apologies for the noise.)
  • Loading branch information
aaaaalbert committed Nov 3, 2014
1 parent ab17403 commit 6f87d75
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion backend/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"""

# Change this for production usage.
authcode = "Eingefuellt, Ihr Lieben!"
authcode = "FILL_THIS_IN"
4 changes: 2 additions & 2 deletions keydb/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"""

# Fill these in with the information needed to use the key database.
dbuser = "keydb"
dbpass = "keydb"
dbuser = ""
dbpass = ""
dbname = "keydb"
dbhost = "localhost"
18 changes: 18 additions & 0 deletions node_state_transitions/statekeys/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
This directory,

clearinghouse/node_state_transitions/statekeys

will contain your clearinghouse's state transition keys (once you
ran the script that generates them, seattle/generate_state_keys.sh)



Note for Seattle Clearinghouse and Beta Seattle Clearinghouse admins:

The statekeys used for seattleclearinghouse.poly.edu and
betaseattleclearinghouse.poly.edu are avialable from directories

clearinghouse/node_state_transitions/statekeys_seattleclearinghouse.poly.edu

and
clearinghouse/node_state_transitions/statekeys_betaseattleclearinghouse.poly.edu
16 changes: 8 additions & 8 deletions website/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@
# you can use django.db.backends.sqlite3 instead of mysql. If you
# decide to do so, you can leave the other fields empty
'ENGINE': 'django.db.backends.mysql',
'NAME': 'clearinghouse',
'USER': 'clearinghouse',
'PASSWORD': 'clearinghouse',
'NAME': 'FILL_THIS_IN',
'USER': 'FILL_THIS_IN',
'PASSWORD': 'FILL_THIS_IN',
'HOST': '',
'PORT': '',
}
Expand All @@ -122,7 +122,7 @@

# Make this unique, and don't share it with anybody.
# Fill this in!
SECRET_KEY = 'schwupsdiwups'
SECRET_KEY = ''

# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
Expand Down Expand Up @@ -280,12 +280,12 @@
# Use session cookies, not persistent cookies.
SESSION_EXPIRE_AT_BROWSER_CLOSE = True

TESTBED = 'Gramatneusiedl'
TESTBED_URL = 'https://gramatneusiedl.at/'
TESTBED = 'Seattle'
TESTBED_URL = 'https://seattle.poly.edu/'
TESTBED_DEVELOPERS_MAIL = 'mailto:[email protected]'
TESTBED_USERS_MAIL = 'mailto:[email protected]'

CLEARINGHOUSE = 'Marktamt'
CLEARINGHOUSE = 'Clearinghouse'
CLEARINGHOUSE_URL = 'https://seattleclearinghouse.poly.edu/'

DEMOKIT = 'Koffer'
DEMOKIT = 'Demokit'
6 changes: 6 additions & 0 deletions website/wsgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "clearinghouse.website.settings")

from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()

14 changes: 0 additions & 14 deletions wsgi/wsgi.py

This file was deleted.

0 comments on commit 6f87d75

Please sign in to comment.