diff --git a/deploy/entrypoint.sh b/deploy/entrypoint.sh index 4339e3f5..69404044 100755 --- a/deploy/entrypoint.sh +++ b/deploy/entrypoint.sh @@ -3,10 +3,10 @@ APP=/app DATA=/data -mkdir -p $DATA/log $DATA/ssl $DATA/test_case $DATA/public/upload $DATA/public/avatar $DATA/public/website +mkdir -p $DATA/log $DATA/config $DATA/ssl $DATA/test_case $DATA/public/upload $DATA/public/avatar $DATA/public/website -if [ ! -f "$APP/oj/custom_settings.py" ]; then - echo SECRET_KEY=\"$(cat /dev/urandom | head -1 | md5sum | head -c 32)\" >> $APP/oj/custom_settings.py +if [ ! -f "$DATA/config/secret.key" ]; then + echo $(cat /dev/urandom | head -1 | md5sum | head -c 32) > "$DATA/config/secret.key" fi if [ ! -f "$DATA/public/avatar/default.png" ]; then diff --git a/oj/custom_settings.example.py b/oj/custom_settings.example.py deleted file mode 100644 index 778f781f..00000000 --- a/oj/custom_settings.example.py +++ /dev/null @@ -1,2 +0,0 @@ -# please set your own SECRET_KEY to a long random string -# SECRET_KEY = "" diff --git a/oj/settings.py b/oj/settings.py index 7656f536..6ba39871 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -13,7 +13,6 @@ import os import raven from copy import deepcopy from utils.shortcuts import get_env -from .custom_settings import * production_env = get_env("OJ_ENV", "dev") == "production" if production_env: @@ -21,6 +20,9 @@ if production_env: else: from .dev_settings import * +with open(os.path.join(DATA_DIR, "config", "secret.key"), "r") as f: + SECRET_KEY = f.read() + BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Applications