From 683534393feec432eb2fe9b8931c1187133a83d1 Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Wed, 13 May 2009 05:20:31 +0100
Subject: [PATCH] [svn] Added URL_ROOT to local settings Copied from
 http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8073 by julian @
 11/7/2008 9:10 AM

---
 localsettingsserver.py  |  2 ++
 localsettingswindows.py | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/localsettingsserver.py b/localsettingsserver.py
index def4aac..22d55be 100644
--- a/localsettingsserver.py
+++ b/localsettingsserver.py
@@ -11,6 +11,8 @@ EXPOWEB = '/home/mjg/expoweb'
 
 PYTHON_PATH = '/home/mjg/expoweb/troggle/'
 
+URL_ROOT = "/"
+
 TEMPLATE_DIRS = (
     "/home/mjg/expoweb/troggle/templates",
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
diff --git a/localsettingswindows.py b/localsettingswindows.py
index a5a1c77..a264e8d 100644
--- a/localsettingswindows.py
+++ b/localsettingswindows.py
@@ -1,16 +1,18 @@
 DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = 'troggle'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'root'             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # 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.
+DATABASE_USER = 'troggle'             # Not used with sqlite3.
+DATABASE_PASSWORD = 'troggle'         # Not used with sqlite3.
+DATABASE_HOST = 'localhost'             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = '3306'             # Set to empty string for default. Not used with sqlite3.
 
-SURVEX_DATA = 'c:\\Expo\\loser\\'
+SURVEX_DATA = 'c:\\loser\\'
 CAVERN = '"C:\\Program Files\\Survex\\cavern"'
-EXPOWEB = 'C:\\Expo\\expoweb\\'
+EXPOWEB = 'C:\\expoweb\\'
 
 PYTHON_PATH = 'C:\\expoweb\\troggle\\'
 
+URL_ROOT = "/"
+
 TEMPLATE_DIRS = (
     "c:/expoweb/troggle/templates",
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".