diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2020-02-22 15:45:20 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2020-02-22 15:45:20 +0000 |
| commit | 656ddcfe93061f2f82160ff8cc45b98d27e28bd3 (patch) | |
| tree | 5e22bb56363ad7e28e2902bc7637b018706e83e0 /localsettingsubuntu.py | |
| parent | 505bc48331035b6fdc9d3ca5f9de77e5a98ba267 (diff) | |
| parent | 92b273e45f96ac20fb182b9166b9f0a96f16eba3 (diff) | |
| download | troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.tar.gz troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.tar.bz2 troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.zip | |
Merge branch 'django-1.10' of ssh://expo.survex.com/~/troggle into django-1.10
Diffstat (limited to 'localsettingsubuntu.py')
| -rw-r--r-- | localsettingsubuntu.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index 3ae475d..26c1453 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -2,7 +2,7 @@ import sys # link localsettings to this file for use on expo computer in austria DATABASES = { - 'default': { + 'default': { 'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. 'NAME' : 'troggle', # Or path to database file if using sqlite3. 'USER' : 'expo', # Not used with sqlite3. @@ -12,6 +12,8 @@ DATABASES = { } } +ALLOWED_HOSTS = ['*'] + EXPOUSER = 'expo' EXPOUSERPASS = 'realpasshere' EXPOUSER_EMAIL = 'wookey@wookware.org' @@ -57,11 +59,4 @@ JSLIB_URL = URL_ROOT + 'javascript/' TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/' -TEMPLATE_DIRS = ( - PYTHON_PATH + "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 = PYTHON_PATH + 'troggle_log.txt' |