From 603ac10d6eb485c9a95f253a14d4967f4aafbfa3 Mon Sep 17 00:00:00 2001
From: 0livd <0livd@users.noreply.github.com>
Date: Wed, 28 Jun 2017 00:04:47 +0200
Subject: Turn the WSGI file into a python module (#240)

* Turn the WSGI file into a python module

* Update conf files to use the new wsgi module

Apache and gunicorn now use the same entrypoint

* Update Changelog
---
 CHANGELOG.rst          | 3 +++
 budget/ihatemoney.wsgi | 1 -
 budget/wsgi.py         | 1 +
 conf/apache-vhost.conf | 2 +-
 conf/supervisord.conf  | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 budget/ihatemoney.wsgi
 create mode 100644 budget/wsgi.py

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6f475e6..33e1de5 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/ihatemoney.wsgi
deleted file mode 100644
index 66f7a73..0000000
--- a/budget/ihatemoney.wsgi
+++ /dev/null
@@ -1 +0,0 @@
-from run import app as application
diff --git a/budget/wsgi.py b/budget/wsgi.py
new file mode 100644
index 0000000..66f7a73
--- /dev/null
+++ b/budget/wsgi.py
@@ -0,0 +1 @@
+from run import app as application
diff --git a/conf/apache-vhost.conf b/conf/apache-vhost.conf
index b3f1349..b26feaa 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
 <Directory /path/to/ihatemoney>
diff --git a/conf/supervisord.conf b/conf/supervisord.conf
index ec2d452..1b5dbbf 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
-- 
cgit v1.1