summaryrefslogtreecommitdiffstats
path: root/localsettingsserver.py
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2020-02-22 15:45:20 +0000
committerSam Wenham <sam@wenhams.co.uk>2020-02-22 15:45:20 +0000
commit656ddcfe93061f2f82160ff8cc45b98d27e28bd3 (patch)
tree5e22bb56363ad7e28e2902bc7637b018706e83e0 /localsettingsserver.py
parent505bc48331035b6fdc9d3ca5f9de77e5a98ba267 (diff)
parent92b273e45f96ac20fb182b9166b9f0a96f16eba3 (diff)
downloadtroggle-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 'localsettingsserver.py')
-rw-r--r--localsettingsserver.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/localsettingsserver.py b/localsettingsserver.py
index 259974e..58bc1a9 100644
--- a/localsettingsserver.py
+++ b/localsettingsserver.py
@@ -1,6 +1,6 @@
import sys
# This is an example file. Copy it to localsettings.py, set the
-# password and _don't_ check that file back to the repo as it exposes
+# password and _don't_ check that file back to the repo as it exposes
# your/our password to the world!
DATABASES = {
@@ -14,6 +14,8 @@ DATABASES = {
}
}
+ALLOWED_HOSTS = ['*']
+
EXPOUSER = 'expo'
EXPOUSERPASS = 'realpasshere'
EXPOUSER_EMAIL = 'wookey@wookware.org'
@@ -55,13 +57,6 @@ JSLIB_URL = URL_ROOT + 'javascript/'
TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/'
TINY_MCE_MEDIA_URL = STATIC_ROOT + '/tiny_mce/'
-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 = '/home/expo/troggle/troggle_log.txt'
FEINCMS_ADMIN_MEDIA='/site_media/feincms/'