summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorexpo <expo@expobox.potato.hut>2011-08-07 16:12:52 +0200
committerexpo <expo@expobox.potato.hut>2011-08-07 16:12:52 +0200
commite9fdea80c051fe9c33cde9c99aed931ab423da2b (patch)
tree070d19f09d6dffe75e228daa4ff97233ca93b365
parent9534bd8881c1fdbe22d8193f1e676f224cc3b93b (diff)
downloadtroggle-e9fdea80c051fe9c33cde9c99aed931ab423da2b.tar.gz
troggle-e9fdea80c051fe9c33cde9c99aed931ab423da2b.tar.bz2
troggle-e9fdea80c051fe9c33cde9c99aed931ab423da2b.zip
Changed ubuntu local settings to be applicable to the expo machine
-rw-r--r--localsettingsubuntu.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py
index 79d5db9..0a1d5e8 100644
--- a/localsettingsubuntu.py
+++ b/localsettingsubuntu.py
@@ -1,9 +1,10 @@
+import sys
# link localsettings to this file for use on expo computer in austria
DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = 'troggle' # Or path to database file if using sqlite3.
-DATABASE_USER = 'troggler3' # Not used with sqlite3.
-DATABASE_PASSWORD = 'ggg' # Not used with sqlite3.
+DATABASE_USER = 'expo' # Not used with sqlite3.
+DATABASE_PASSWORD = 'gosser' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
@@ -42,10 +43,10 @@ TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'
TEMPLATE_DIRS = (
- "/home/goatchurch/expoweb/troggle/templates",
+ "/home/expo/expofiles/troggle/templates",
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
-LOGFILE = '/home/expo/expofiles/expoweb/parsing_log.txt'
+LOGFILE = '/home/expo/expofiles/troggle/parsing_log.txt'