summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolly <olly@survex.com>2013-08-08 15:48:10 +0200
committerolly <olly@survex.com>2013-08-08 15:48:10 +0200
commit6b4ea7b83ed782549e9a96a4865c91e8931836e8 (patch)
tree6738d4e790fe8084daead7b54d164d4c6006a345
parentda71cca22f29fcc43d2bbb049d025d8bee2b5ed3 (diff)
parent5c945e3431f47d7fc044861ff6b93224b1f81fc4 (diff)
downloadtroggle-6b4ea7b83ed782549e9a96a4865c91e8931836e8.tar.gz
troggle-6b4ea7b83ed782549e9a96a4865c91e8931836e8.tar.bz2
troggle-6b4ea7b83ed782549e9a96a4865c91e8931836e8.zip
merge
-rw-r--r--localsettingsserver.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/localsettingsserver.py b/localsettingsserver.py
index 1123f04..949da3c 100644
--- a/localsettingsserver.py
+++ b/localsettingsserver.py
@@ -4,11 +4,11 @@ sys.path.append("/home/expo/troggle")
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
- 'NAME': 'troggle', # Or path to database file if using sqlite3.
- 'USER': 'expo', # Not used with sqlite3.
- 'PASSWORD': 'gosser', # Not used with sqlite3.
- 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
- 'PORT': '', # Set to empty string for default. Not used with sqlite3.
+ 'NAME': 'troggle', # Or path to database file if using sqlite3.
+ 'USER': 'undemocracy', # Not used with sqlite3.
+ 'PASSWORD': 'aiGohsh5', # Not used with sqlite3.
+ 'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
+ 'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}
@@ -30,8 +30,6 @@ FILES = '/home/expo/expoimages'
EXPOWEB_URL = 'http://expo.survex.com/'
-MMMMC_DIR = "/home/expo/mmmc"
-
SURVEYS_URL = 'http://expo.survex.com/survey_scans/'
PYTHON_PATH = '/home/expo/troggle/'