diff --git a/README.md b/README.md index 6fd3fda..52d3979 100644 --- a/README.md +++ b/README.md @@ -19,19 +19,19 @@ Initialize the database: ```shell createdb covid19_test -env DB_NAME=covid19_test ./manage.py migrate +./manage.py migrate ``` Create a superuser: ```shell -env DB_NAME=covid19_test ./manage.py createsuperuser +./manage.py createsuperuser ``` Load test data: ```shell -env DB_NAME=covid19_test ./manage.py loaddata country redflag equitycategory equitykeywords +./manage.py loaddata country redflag equitycategory equitykeywords ``` ## Tasks @@ -39,7 +39,7 @@ env DB_NAME=covid19_test ./manage.py loaddata country redflag equitycategory equ Run a development server: ```shell -env DEBUG=True DB_NAME=covid19_test ./manage.py runserver +env DEBUG=True ./manage.py runserver ``` To add, remove or upgrade a requirement, [follow these instructions](https://ocp-software-handbook.readthedocs.io/en/latest/python/applications.html#requirements). diff --git a/covidadmin/.env.example b/covidadmin/.env.example deleted file mode 100644 index f052338..0000000 --- a/covidadmin/.env.example +++ /dev/null @@ -1,26 +0,0 @@ -DEBUG=on - -SECRET_KEY=your-secret-key - -DB_ENGINE=django.db.backends.postgresql_psycopg2 -DB_NAME= -DB_USER= -DB_PASSWORD= -DB_HOST= -DB_PORT= -ALLOWED_HOSTS=localhost,127.0.0.1 -CORS_ORIGIN_WHITELIST= -SENTRY_DSN= - -CELERY_BROKER_URL=pyamqp://guest@localhost/ -CELERY_TIMEZONE=UTC - -FORCE_SCRIPT_NAME=/ -STATIC_URL=/static/ -MEDIA_URL=/media/ - -FETCH_COVID_DATA_INTERVAL=10800 - -GOOGLE_SHEET_CREDENTIALS_JSON= - -FIXER_IO_API_KEY= diff --git a/covidadmin/settings.py b/covidadmin/settings.py index 58d70e4..52741b3 100644 --- a/covidadmin/settings.py +++ b/covidadmin/settings.py @@ -17,22 +17,21 @@ import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration -environ.Env.read_env() env = environ.Env( # set casting, default value SECRET_KEY=(str, "ig0(igk8+n76thmh-@%*n4bc1ra3sq-#x)kx6bqf&zdh9n1*+8"), DEBUG=(bool, False), ALLOWED_HOSTS=(list, []), DB_ENGINE=(str, "django.db.backends.postgresql_psycopg2"), - DB_NAME=(str, ""), + DB_NAME=(str, "covid19"), DB_USER=(str, ""), DB_PASSWORD=(str, ""), - DB_HOST=(str, "127.0.0.1"), + DB_HOST=(str, "localhost"), DB_PORT=(int, 5432), STATIC_URL=(str, "/static/"), FORCE_SCRIPT_NAME=(str, "/"), CORS_ORIGIN_WHITELIST=(list, []), - CELERY_BROKER_URL=(str, "pyamqp://localhost/"), + CELERY_BROKER_URL=(str, "pyamqp://guest@localhost/"), CELERY_TIMEZONE=(str, "UTC"), FETCH_COVID_DATA_INTERVAL=(int, 10800), GOOGLE_SHEET_CREDENTIALS_JSON=(str, ""),