Compare commits

...

19 Commits

Author SHA1 Message Date
Andreas Zweili 4d3c9c7596 Merge branch 'master' into production 2018-03-02 17:32:29 +01:00
Andreas Zweili db43275f69 Merge branch 'production' of git.2li.ch:ibz/web_AI-5 into production 2018-03-02 16:22:12 +01:00
Andreas Zweili 1a325cfaad Merge branch 'master' into production 2018-03-02 16:22:08 +01:00
Andreas Zweili ffcf22937c Merge branch 'master' into production 2018-02-28 22:24:43 +01:00
Andreas Zweili 2f7a565545 Merge branch 'master' into production 2018-01-28 22:05:24 +01:00
Andreas Zweili 097e46988a Merge branch 'master' into production 2018-01-28 21:34:59 +01:00
Andreas Zweili 33261ecdb2 Merge branch 'master' into production 2018-01-28 12:57:56 +01:00
Andreas Zweili 0d89651219 Merge branch 'master' into production 2018-01-14 13:00:42 +01:00
Andreas Zweili 6f25179795 Merge branch 'master' into production 2018-01-14 12:39:02 +01:00
Andreas Zweili 05717a63ea Merge branch 'master' into production 2018-01-14 12:36:57 +01:00
Andreas Zweili c7abe2ffd2 Merge branch 'master' into production 2018-01-14 12:34:47 +01:00
Andreas Zweili 75dac7d385 Merge branch 'master' into production 2018-01-14 12:28:48 +01:00
Andreas Zweili 50d7d11fe4 Merge branch 'production' of git.2li.ch:ibz/web_AI-5 into production 2018-01-13 17:40:17 +01:00
Andreas Zweili f7d86ea9c0 Merge branch 'master' into production 2018-01-13 17:40:11 +01:00
Andreas Zweili 185f07044c remove a duplicate application entry 2018-01-13 09:32:03 +01:00
Andreas Zweili b31133b5b2 correct the settings for the production server 2018-01-13 08:31:18 +01:00
Andreas Zweili 5c9a8bec1a Merge branch 'master' into production 2018-01-13 08:30:23 +01:00
Andreas Zweili 9269e77e4a Merge branch 'master' into production 2017-12-31 15:23:59 +01:00
Andreas Zweili bf1533bcd7 force django to use ssl 2017-12-30 17:59:56 +01:00
1 changed files with 4 additions and 1 deletions

View File

@ -23,7 +23,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = '(#4#-$$&mx7(%q+6&&@-c&g%i0dc4)zfks1%sy8b%lsxspou&%'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
DEBUG = False
ALLOWED_HOSTS = [
'localhost',
@ -164,3 +164,6 @@ MEDIA_URL = '/media/'
MEDIA_ROOT = '/srv/media/'
LOGIN_REDIRECT_URL = '/'
CSRF_COOKIE_SECURE = True
SESSION_COOKIE_SECURE = True