summaryrefslogtreecommitdiffstats
path: root/localsettingspotatohut.py
diff options
context:
space:
mode:
Diffstat (limited to 'localsettingspotatohut.py')
-rw-r--r--localsettingspotatohut.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py
index a9c39d5..f60db84 100644
--- a/localsettingspotatohut.py
+++ b/localsettingspotatohut.py
@@ -15,6 +15,10 @@ DATABASES = {
}
}
+EXPOUSER = 'expo'
+EXPOUSERPASS = 'realpasshere'
+EXPOUSER_EMAIL = 'wookey@wookware.org'
+
REPOS_ROOT_PATH = '/home/expo/'
sys.path.append(REPOS_ROOT_PATH)
sys.path.append(REPOS_ROOT_PATH + 'troggle')
@@ -44,7 +48,11 @@ MEDIA_URL = '/' + DIR_ROOT + 'site_media/'
MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/'
MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/'
+<<<<<<< local
JSLIB_PATH = '/usr/share/javascript/'
+=======
+JSLIB_URL = URL_ROOT + 'javascript/'
+>>>>>>> other
TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/'