From e3285bef364a675f97b9e4f08c47a45405399561 Mon Sep 17 00:00:00 2001 From: JocelynDelalande Date: Mon, 23 Oct 2017 18:05:50 +0200 Subject: Enhance install process by generating config files from templates (#275) * Add a command to generate configuration examples Config files are generated from templates (which remplace previous example files). - solve the issue of hard-to-explain configuration examples - ease pkg path seeking (avoid it, actually) - add working defaults for sqlite and unix socket paths (instead of /replace/me/path/example) - move settings comments from default_settings.py to ihatemoney.cfg.j2, as it is the one that will be facing user. * Use generate-config command in install doc Also follow the new working defaults of templates for socket and db path. * Fix doc settings table On the long term, plaintext tables might destroy humanity. * Mention templates dir URL in documentation As requested by @almet --- conf/apache-vhost.conf | 18 ------------------ conf/gunicorn.conf.py | 7 ------- conf/nginx.conf | 30 ------------------------------ conf/supervisord.conf | 6 ------ 4 files changed, 61 deletions(-) delete mode 100644 conf/apache-vhost.conf delete mode 100644 conf/gunicorn.conf.py delete mode 100644 conf/nginx.conf delete mode 100644 conf/supervisord.conf (limited to 'conf') diff --git a/conf/apache-vhost.conf b/conf/apache-vhost.conf deleted file mode 100644 index 1a84e7f..0000000 --- a/conf/apache-vhost.conf +++ /dev/null @@ -1,18 +0,0 @@ - - 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/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 - - WSGIProcessGroup ihatemoney - WSGIApplicationGroup %{GLOBAL} - Order deny,allow - Allow from all - -# 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 deleted file mode 100644 index 017a670..0000000 --- a/conf/gunicorn.conf.py +++ /dev/null @@ -1,7 +0,0 @@ -backlog = 2048 -daemon = False -debug = True -workers = 3 -logfile = "/path/to/your/app/ihatemoney.gunicorn.log" -loglevel = "info" -bind = "unix:/path/to/your/app/ihatemoney.gunicorn.sock" diff --git a/conf/nginx.conf b/conf/nginx.conf deleted file mode 100644 index 0fe26f0..0000000 --- a/conf/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - server_name yourur; - keepalive_timeout 5; - - location /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; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_connect_timeout 90; - proxy_send_timeout 180; - proxy_read_timeout 180; - proxy_buffer_size 16k; - proxy_buffers 8 16k; - proxy_busy_buffers_size 32k; - proxy_intercept_errors on; - if (!-f $request_filename) { - proxy_pass http://ihatemoney_backend; - break; - } - } -} - -upstream ihatemoney_backend { - server unix:/path/to/app/ihatemoney.gunicorn.sock; -} diff --git a/conf/supervisord.conf b/conf/supervisord.conf deleted file mode 100644 index 8d3ac70..0000000 --- a/conf/supervisord.conf +++ /dev/null @@ -1,6 +0,0 @@ -[program:ihatemoney] -command=/path/to/your/app/venv/bin/gunicorn -c /etc/ihatemoney/gunicorn.conf.py ihatemoney.wsgi:application -user=www -autostart=true -autorestart=true -redirect_stderr=True -- cgit v1.1