From 68e411473540c136dfdb269af888ceddbd0d403b Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Sun, 20 Aug 2017 12:25:57 +0200 Subject: Streamline installation doc, now using pip (#252) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix conf files to reflect module renaming Python module was renamed budget → ihatemoney (see #243 and 6923367). Now, "budget" relates to nothing. * Harmonize `APPLICATION_ROOT` doc with other settings * Fix link markup * Switch documentation to recomend pip over git - Update installation instruction - Clearly separate dev setup from installation - Some rewordings/section-ization by the way * Add a hint on how to find the static path This is a downside on the pip choice over git for installation. We will have to ease that a bit. By doc or by code, before next release. * Make the nginx deployment doc more accurate * Add a big fat warning about SECRET_KEY in doc --- conf/apache-vhost.conf | 8 +++++--- conf/gunicorn.conf.py | 4 ++-- conf/nginx.conf | 10 ++++++---- conf/supervisord.conf | 3 +-- 4 files changed, 14 insertions(+), 11 deletions(-) (limited to 'conf') diff --git a/conf/apache-vhost.conf b/conf/apache-vhost.conf index b26feaa..1a84e7f 100644 --- a/conf/apache-vhost.conf +++ b/conf/apache-vhost.conf @@ -2,8 +2,8 @@ ServerAdmin admin@example.com 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/wsgi.py + WSGIDaemonProcess ihatemoney user=www-data group=www-data threads=5 python-path=/path/to/ihatemoney/ihatemoney # python-home=/path/to/your/venv + WSGIScriptAlias / /path/to/ihatemoney/ihatemoney/wsgi.py ErrorLog /var/log/apache2/ihatemoney.example.com_error.log CustomLog /var/log/apache2/ihatemoney.example.com_access.log combined @@ -12,5 +12,7 @@ Order deny,allow Allow from all -Alias /static/ /path/to/ihatemoney/budget/static/ +# Alias value may be some messy path, within python libs. +# You may want to use "find $VIRTUAL_ENV -path */ihatemoney*/static" to find it. +Alias /static/ /path/to/ihatemoney/ihatemoney/static/ diff --git a/conf/gunicorn.conf.py b/conf/gunicorn.conf.py index 8412a10..017a670 100644 --- a/conf/gunicorn.conf.py +++ b/conf/gunicorn.conf.py @@ -2,6 +2,6 @@ backlog = 2048 daemon = False debug = True workers = 3 -logfile = "/path/to/your/app/budget.gunicorn.log" +logfile = "/path/to/your/app/ihatemoney.gunicorn.log" loglevel = "info" -bind = "unix:/path/to/your/app/budget.gunicorn.sock" +bind = "unix:/path/to/your/app/ihatemoney.gunicorn.sock" diff --git a/conf/nginx.conf b/conf/nginx.conf index 9ae2ca0..0fe26f0 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,7 +3,9 @@ server { keepalive_timeout 5; location /static/ { - alias /path/to/app/budget/static/; + # Alias value may be some messy path, within python libs. + # You may want to use "find $VIRTUAL_ENV -path */ihatemoney*/static" to find it. + alias /path/to/app/ihatemoney/static/; } location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -17,12 +19,12 @@ server { proxy_busy_buffers_size 32k; proxy_intercept_errors on; if (!-f $request_filename) { - proxy_pass http://budget_backend; + proxy_pass http://ihatemoney_backend; break; } } } -upstream budget_backend { - server unix:/path/to/app/budget.gunicorn.sock; +upstream ihatemoney_backend { + server unix:/path/to/app/ihatemoney.gunicorn.sock; } diff --git a/conf/supervisord.conf b/conf/supervisord.conf index 1b5dbbf..98bb4eb 100644 --- a/conf/supervisord.conf +++ b/conf/supervisord.conf @@ -1,6 +1,5 @@ [program:budget] -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/ +command=/path/to/your/app/venv/bin/gunicorn -c /etc/ihatemoney/gunicorn.conf.py ihatemoney.wsgi:application user=www autostart=true autorestart=true -- cgit v1.1