diff options
Diffstat (limited to 'forums')
| -rw-r--r-- | forums/settings.py | 19 | ||||
| -rw-r--r-- | forums/wsgi.py | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/forums/settings.py b/forums/settings.py index 725bf62..d793004 100644 --- a/forums/settings.py +++ b/forums/settings.py @@ -28,22 +28,13 @@ DATABASES = { }, 'spoken': { 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'CDEEP', # Or path to database file if using sqlite3. + 'NAME': 'spoken', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: 'USER': db_user, 'PASSWORD': db_pass, 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. 'PORT': '', # Set to empty string for default. }, - 'otc': { - 'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'OTC', # Or path to database file if using sqlite3. - # The following settings are not used with sqlite3: - 'USER': db_user, - 'PASSWORD': db_pass, - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. - } } # Hosts/domain names that are valid for this site; required if DEBUG is False @@ -156,7 +147,7 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'website', 'widget_tweaks', - 'drupal_auth', + 'spoken_auth', 'compressor', 'debug_toolbar', ) @@ -190,9 +181,9 @@ LOGGING = { } } -AUTH_USER_MODEL = 'drupal_auth.Users' -AUTHENTICATION_BACKENDS = ( 'drupal_auth.backends.DrupalAuthBackend', ) -DATABASE_ROUTERS = ['drupal_auth.routers.DrupalAuthRouter'] +AUTH_USER_MODEL = 'spoken_auth.Users' +AUTHENTICATION_BACKENDS = ( 'spoken_auth.backends.DrupalAuthBackend', ) +DATABASE_ROUTERS = ['spoken_auth.routers.DrupalAuthRouter'] TEMPLATE_CONTEXT_PROCESSORS += ( 'django.core.context_processors.request', 'website.context_processors.admin_processor', diff --git a/forums/wsgi.py b/forums/wsgi.py index 728eed4..aacba59 100644 --- a/forums/wsgi.py +++ b/forums/wsgi.py @@ -16,7 +16,7 @@ framework. import os import sys -sys.path.append('/Sites/venv/forums/') +#sys.path.append('/Sites/venv/forums/') # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks # if running multiple sites in the same mod_wsgi process. To fix this, use @@ -24,8 +24,8 @@ sys.path.append('/Sites/venv/forums/') # os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" -activate_this = '/Sites/venv/bin/activate_this.py' -execfile(activate_this, dict(__file__=activate_this)) +#activate_this = '/Sites/venv/bin/activate_this.py' +#execfile(activate_this, dict(__file__=activate_this)) # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION |