diff --git a/Makefile b/Makefile index 9cf5af7..acff254 100644 --- a/Makefile +++ b/Makefile @@ -26,23 +26,25 @@ venv_prod: requirements/prod.txt test: venv_test source ./venv_test/bin/activate && \ - DJANGO_SETTINGS_MODULE="repoapi.settings.dev" ./manage.py jenkins + ./manage.py jenkins --settings="repoapi.settings.dev" deploy: venv_prod mkdir -p ./venv_prod/etc/uwsgi/vassals/ [ -L ./venv_prod/etc/uwsgi/vassals/repoapi_uwsgi.ini ] || \ ln -s $(shell pwd)/repoapi/repoapi_uwsgi.ini \ ./venv_prod/etc/uwsgi/vassals/ + touch ./venv_prod/etc/uwsgi/vassals/repoapi_uwsgi.ini ################################### run_dev: venv_dev source ./venv_dev/bin/activate && \ - DJANGO_SETTINGS_MODULE="repoapi.settings.dev" ./manage.py runserver_plus + ./manage.py runserver_plus --settings="repoapi.settings.dev" run: deploy + mkdir -p ./venv_prod/run + chgrp www-data ./venv_prod/run && chmod 770 ./venv_prod/run source ./venv_prod/bin/activate && \ - DJANGO_SETTINGS_MODULE="repoapi.settings.prod" \ uwsgi --emperor ./venv_prod/etc/uwsgi/vassals/ \ --uid www-data --gid www-data diff --git a/repoapi/repoapi_uwsgi.ini b/repoapi/repoapi_uwsgi.ini index 8c227c8..e426019 100644 --- a/repoapi/repoapi_uwsgi.ini +++ b/repoapi/repoapi_uwsgi.ini @@ -12,10 +12,12 @@ home = /srv/repoapi/venv_prod # master master = true # maximum number of worker processes -processes = 10 +processes = 5 # the socket (use the full path to be safe -socket = /srv/repoapi/repoapi.sock +socket = /srv/repoapi/venv_prod/run/repoapi.sock # ... with appropriate permissions - may be needed # chmod-socket = 664 # clear environment on exit vacuum = true +logto = /var/log/uwsgi-repoapi.log +env = DJANGO_SETTINGS_MODULE=repoapi.settings.prod diff --git a/repoapi/settings/prod.py b/repoapi/settings/prod.py index fa254bd..d32615f 100644 --- a/repoapi/settings/prod.py +++ b/repoapi/settings/prod.py @@ -24,12 +24,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # SECURITY WARNING: keep the secret key used in production secret! # read it from external file -SECRET_KEY = os.path.join(BASE_DIR, '.secret_key').read().strip() +SECRET_KEY = open(os.path.join(BASE_DIR, '.secret_key')).read().strip() # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['.mgm.sipwise.com'] # Application definition @@ -47,6 +47,7 @@ INSTALLED_APPS = [ 'rest_framework', 'rest_framework_swagger', 'django_extensions', + 'django_assets', ] INSTALLED_APPS.extend(PROJECT_APPS)