mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-22 07:11:52 +00:00
Merge
This commit is contained in:
commit
c3952cf3e7
@ -9,7 +9,7 @@ DATABASES = {
|
||||
'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': 'wibble', # Not used with sqlite3.
|
||||
'PASSWORD': 'notarealpassword', # 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.
|
||||
}
|
||||
@ -48,6 +48,7 @@ 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/'
|
||||
|
||||
JSLIB_PATH = '/usr/share/javascript/'
|
||||
JSLIB_URL = URL_ROOT + 'javascript/'
|
||||
|
||||
TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/'
|
||||
|
Loading…
Reference in New Issue
Block a user