mhu/shimatta-kenkyusho
2
0
Fork 0
Code Issues 15 Pull Requests 2 Releases Wiki Activity

Compare commits

base: mhu:64d0a1bfb3f341369a7e209b2b00cdc55629a98d
Branches Tags
mhu:develop
mhu:issue/23-add-docu
mhu:feature/21-add-package-params
mhu:master
mhu:port-to-django-425
mhu:advanced-formset-search
..
compare: mhu:254bf2bdf0d0c19d59bc2775cd78f1fa0c21f892
Branches Tags
mhu:issue/23-add-docu
mhu:develop
mhu:feature/21-add-package-params
mhu:master
mhu:port-to-django-425
mhu:advanced-formset-search

No commits in common. "64d0a1bfb3f341369a7e209b2b00cdc55629a98d" and "254bf2bdf0d0c19d59bc2775cd78f1fa0c21f892" have entirely different histories.
64d0a1bfb3 ... 254bf2bdf0

2 changed files with 3 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
entrypoint.sh
View File

@ -3,4 +3,4 @@ source /home/shimatta/kenkyusho/.venv/bin/activate
cd /home/shimatta/kenkyusho/shimatta_kenkyusho cd /home/shimatta/kenkyusho/shimatta_kenkyusho
python manage.py migrate --settings shimatta_kenkyusho.settings_production python manage.py migrate --settings shimatta_kenkyusho.settings_production
python manage.py collectstatic --settings shimatta_kenkyusho.settings_production --noinput python manage.py collectstatic --settings shimatta_kenkyusho.settings_production --noinput
gunicorn -w 4 --bind 0.0.0.0:8000 shimatta_kenkyusho.wsgi:application gunicorn -w 4 shimatta_kenkyusho.wsgi:application

11
shimatta_kenkyusho/shimatta_kenkyusho/settings_production.py
View File

@ -16,13 +16,9 @@ The following environment variables have to be set:
- DJANGO_MEDIA_URL - DJANGO_MEDIA_URL
- DJANGO_MEDIA_ROOT - DJANGO_MEDIA_ROOT
- DJANGO_POSTGRESQL_SOCKET - DJANGO_POSTGRESQL_SOCKET
- DJANGO_POSTGRESQL_PORT
The following can be set The following can be set
- DJANGO_POSTGRESQL_PW (assumed empty if missing)
- DJANGO_POSTGRESQL_USER (assmumed empty if mssing)
- DJANGO_SECURE_HSTS_SECONDS (defaults to 120) - DJANGO_SECURE_HSTS_SECONDS (defaults to 120)
- DJANGO_FORCE_DEV_MODE
""" """
@ -50,11 +46,8 @@ SECRET_KEY = get_env_value('DJANGO_SECRET_KEY')
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = False
if get_env_value('DJANGO_FORCE_DEV_MODE', default=False) == 'True':
DEBUG = True
ALLOWED_HOSTS = ['localhost', get_env_value('DJANGO_ALLOWED_HOST')]
ALLOWED_HOSTS = ['127.0.0.1', 'localhost', get_env_value('DJANGO_ALLOWED_HOST')]
# Application definition # Application definition
@ -239,4 +232,4 @@ CSRF_COOKIE_SECURE = True
SECURE_SSL_REDIRECT = False SECURE_SSL_REDIRECT = False
SECURE_HSTS_SECONDS = get_env_value('DJANGO_SECURE_HSTS_SECONDS', default=120) SECURE_HSTS_SECONDS = get_env_value('DJANGO_SECURE_HSTS_SECONDS', default=120)