diff options
| author | expo <expo@expobox.potato.hut> | 2016-06-09 04:16:46 +0100 |
|---|---|---|
| committer | expo <expo@expobox.potato.hut> | 2016-06-09 04:16:46 +0100 |
| commit | 4320e7629813aef22a8778b12efdb593687542da (patch) | |
| tree | 1a625d478f7c21504c98e6a91ccfd0dfca79787e /localsettingspotatohut.py | |
| parent | c3952cf3e75ae0cfea234eb6ff5ee595d4297e82 (diff) | |
| parent | 32f3dac62196e3cad7b9a9b1b949d6970529666f (diff) | |
| download | troggle-4320e7629813aef22a8778b12efdb593687542da.tar.gz troggle-4320e7629813aef22a8778b12efdb593687542da.tar.bz2 troggle-4320e7629813aef22a8778b12efdb593687542da.zip | |
merge serve changes
HGerver canges Enter commit message. Lines beginning with 'HG:' are removed.
Diffstat (limited to 'localsettingspotatohut.py')
| -rw-r--r-- | localsettingspotatohut.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index f1b6a3b..a9c39d5 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -15,10 +15,6 @@ 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') @@ -33,8 +29,8 @@ CAVERN = 'cavern' THREEDTOPOS = '3dtopos' EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' -FILES = REPOS_ROOT_PATH + 'expofiles' +SURVEY_SCANS = REPOS_ROOT_PATH + 'expoimages/' +FILES = REPOS_ROOT_PATH + 'expoimages' PYTHON_PATH = '/home/expo/troggle/' @@ -49,7 +45,6 @@ MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' JSLIB_PATH = '/usr/share/javascript/' -JSLIB_URL = URL_ROOT + 'javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' |