diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6f475e6d..33e1de58 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,9 @@ This document describes changes between each past release. ### Changed - **BREAKING CHANGE** Use a hashed ``ADMIN_PASSWORD`` instead of a clear text one, ``./budget/manage.py generate_password_hash`` can be used to generate a proper password HASH (#236) +- **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration! +- Changed the recommended gunicorn configuration to use the wsgi module as an entrypoint + ### Removed diff --git a/budget/ihatemoney.wsgi b/budget/wsgi.py similarity index 100% rename from budget/ihatemoney.wsgi rename to budget/wsgi.py diff --git a/conf/apache-vhost.conf b/conf/apache-vhost.conf index b3f13495..b26feaa5 100644 --- a/conf/apache-vhost.conf +++ b/conf/apache-vhost.conf @@ -3,7 +3,7 @@ ServerName ihatemoney.example.com # Uncomment the python-home option if you use a virtualenv WSGIDaemonProcess ihatemoney user=www-data group=www-data threads=5 python-path=/path/to/ihatemoney/budget # python-home=/path/to/your/venv - WSGIScriptAlias / /path/to/ihatemoney/budget/ihatemoney.wsgi + WSGIScriptAlias / /path/to/ihatemoney/budget/wsgi.py ErrorLog /var/log/apache2/ihatemoney.example.com_error.log CustomLog /var/log/apache2/ihatemoney.example.com_access.log combined diff --git a/conf/supervisord.conf b/conf/supervisord.conf index ec2d452f..1b5dbbf0 100644 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -1,5 +1,5 @@ [program:budget] -command=/path/to/your/app/venv/bin/gunicorn -c /path/to/your/app/conf/gunicorn.conf.py run:app +command=/path/to/your/app/venv/bin/gunicorn -c /path/to/your/app/conf/gunicorn.conf.py wsgi:application directory=/path/to/your/app/budget/ user=www autostart=true