diff options
| -rw-r--r-- | localsettingsdocker.py | 11 | ||||
| -rw-r--r-- | localsettingspotatohut.py | 9 | ||||
| -rw-r--r-- | localsettingsserver.py | 11 | ||||
| -rw-r--r-- | localsettingsubuntu.py | 11 | ||||
| -rw-r--r-- | localsettingswindows.py | 15 |
5 files changed, 14 insertions, 43 deletions
diff --git a/localsettingsdocker.py b/localsettingsdocker.py index bc7d8cb..6a325d1 100644 --- a/localsettingsdocker.py +++ b/localsettingsdocker.py @@ -2,7 +2,7 @@ import sys # This is the local settings for use with the docker compose dev setup. It is imported automatically 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' : 'troggleuser', # Not used with sqlite3. @@ -12,6 +12,8 @@ DATABASES = { } } +ALLOWED_HOSTS = ['*'] + EXPOUSER = 'expo' EXPOUSERPASS = 'somepasshere' EXPOUSER_EMAIL = 'wookey@wookware.org' @@ -55,11 +57,4 @@ 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 = PYTHON_PATH + 'troggle_log.txt' diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index 976e61a..c6620a9 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -15,6 +15,8 @@ DATABASES = { } } +ALLOWED_HOSTS = ['*'] + REPOS_ROOT_PATH = '/home/expo/' sys.path.append(REPOS_ROOT_PATH) sys.path.append(REPOS_ROOT_PATH + 'troggle') @@ -53,13 +55,6 @@ JSLIB_PATH = '/usr/share/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 = '/home/expo/troggle/troggle_log.txt' FEINCMS_ADMIN_MEDIA='/site_media/feincms/' 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/' 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' diff --git a/localsettingswindows.py b/localsettingswindows.py index 110bd36..ed6f486 100644 --- a/localsettingswindows.py +++ b/localsettingswindows.py @@ -9,6 +9,8 @@ DATABASES = { } } +ALLOWED_HOSTS = ['*'] + EXPOUSER = 'expo' EXPOUSERPASS = 'realpasshere' EXPOUSER_EMAIL = 'wookey@wookware.org' @@ -30,7 +32,7 @@ URL_ROOT = 'http://127.0.0.1:8000' DIR_ROOT = ''#this should end in / if a value is given PUBLIC_SITE = False -TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' +TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' PYTHON_PATH = 'C:\\expoweb\\troggle\\' @@ -56,14 +58,3 @@ EMAIL_USE_TLS = True # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" - - - - -TEMPLATE_DIRS = ( - "C:/Expo/expoweb/troggle/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. -) |