diff --git a/deploy/nginx/nginx.conf b/deploy/nginx/nginx.conf index 81ff345..71060e1 100644 --- a/deploy/nginx/nginx.conf +++ b/deploy/nginx/nginx.conf @@ -43,18 +43,18 @@ http { include http_locations.conf; } - server { - listen 1443 ssl http2 default_server; - server_name _; - ssl_certificate /data/ssl/server.crt; - ssl_certificate_key /data/ssl/server.key; - ssl_protocols TLSv1.2; - ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; - ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; + # server { + # listen 1443 ssl http2 default_server; + # server_name _; + # ssl_certificate /data/ssl/server.crt; + # ssl_certificate_key /data/ssl/server.key; + # ssl_protocols TLSv1.2; + # ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; + # ssl_prefer_server_ciphers on; + # ssl_session_cache shared:SSL:10m; - include https_locations.conf; - } + # include https_locations.conf; + # } } diff --git a/oj/dev_settings.py b/oj/dev_settings.py index f79cc87..8bc626d 100644 --- a/oj/dev_settings.py +++ b/oj/dev_settings.py @@ -5,19 +5,19 @@ from utils.shortcuts import get_env BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'HOST': get_env('POSTGRES_HOST', '127.0.0.1'), - 'PORT': get_env('POSTGRES_PORT', '5435'), - 'NAME': get_env('POSTGRES_DB', 'onlinejudge'), - 'USER': get_env('POSTGRES_USER', 'onlinejudge'), - 'PASSWORD': get_env('POSTGRES_PASSWORD', 'onlinejudge') + "default": { + "ENGINE": "django.db.backends.postgresql_psycopg2", + "HOST": get_env("POSTGRES_HOST", "127.0.0.1"), + "PORT": get_env("POSTGRES_PORT", "5435"), + "NAME": get_env("POSTGRES_DB", "onlinejudge"), + "USER": get_env("POSTGRES_USER", "onlinejudge"), + "PASSWORD": get_env("POSTGRES_PASSWORD", "onlinejudge"), } } REDIS_CONF = { - 'host': get_env('REDIS_HOST', '127.0.0.1'), - 'port': get_env('REDIS_PORT', '6380') + "host": get_env("REDIS_HOST", "127.0.0.1"), + "port": get_env("REDIS_PORT", "6380"), } diff --git a/oj/production_settings.py b/oj/production_settings.py index e1bcde8..f98838b 100644 --- a/oj/production_settings.py +++ b/oj/production_settings.py @@ -1,23 +1,23 @@ from utils.shortcuts import get_env DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'HOST': get_env("POSTGRES_HOST", "oj-postgres"), - 'PORT': get_env("POSTGRES_PORT", "5432"), - 'NAME': get_env("POSTGRES_DB"), - 'USER': get_env("POSTGRES_USER"), - 'PASSWORD': get_env("POSTGRES_PASSWORD") + "default": { + "ENGINE": "django.db.backends.postgresql_psycopg2", + "HOST": get_env("POSTGRES_HOST", "oj-postgres"), + "PORT": get_env("POSTGRES_PORT", "5432"), + "NAME": get_env("POSTGRES_DB"), + "USER": get_env("POSTGRES_USER"), + "PASSWORD": get_env("POSTGRES_PASSWORD"), } } REDIS_CONF = { "host": get_env("REDIS_HOST", "oj-redis"), - "port": get_env("REDIS_PORT", "6379") + "port": get_env("REDIS_PORT", "6379"), } DEBUG = False -ALLOWED_HOSTS = ['*'] +ALLOWED_HOSTS = ["*"] DATA_DIR = "/data"