summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorÉtienne Loks <etienne@peacefrogs.net>2019-08-27 13:44:08 +0200
committerÉtienne Loks <etienne@peacefrogs.net>2019-08-27 13:44:08 +0200
commitc384df96808d7783e1d1312a68f6c265bf1a4c75 (patch)
treeac6ad1a6b20ffffdcb75b6c961f6d230cf92b0f8 /conf
parent7f9d36892be1da433cd20ff17caa0487a7e6179b (diff)
downloadishtar-pergamon-c384df96808d7783e1d1312a68f6c265bf1a4c75.tar.bz2
ishtar-pergamon-c384df96808d7783e1d1312a68f6c265bf1a4c75.zip
Installation: complete instruction - fix conf files and settings
Diffstat (limited to 'conf')
-rw-r--r--conf/nginx.conf.template4
-rw-r--r--conf/uwsgi.ini.template2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/nginx.conf.template b/conf/nginx.conf.template
index 785bc57..923e14e 100644
--- a/conf/nginx.conf.template
+++ b/conf/nginx.conf.template
@@ -14,7 +14,7 @@ server {
gzip_types text/plain text/css text/js text/xml text/javascript application/javascript application/x-javascript application/json application/xml application/rss+xml image/svg+xml;
location /static/ { # STATIC_URL
- alias /srv/ishtar-pergamon/static/; # STATIC_ROOT
+ alias /srv/ishtar-pergamon/collected_static/; # STATIC_ROOT
expires 30d;
}
@@ -25,7 +25,7 @@ server {
location / {
include uwsgi_params;
- uwsgi_pass unix:/var/lib/uwsgi/run/ishtar_pergamon.sock;
+ uwsgi_pass unix:/var/lib/uwsgi/run/pergamon.sock;
uwsgi_read_timeout 1800;
uwsgi_send_timeout 600;
}
diff --git a/conf/uwsgi.ini.template b/conf/uwsgi.ini.template
index 09ee6b7..1287179 100644
--- a/conf/uwsgi.ini.template
+++ b/conf/uwsgi.ini.template
@@ -9,7 +9,7 @@ home = /srv/venv/pergamon/
plugins = python
master = true
protocol = uwsgi
-env = DJANGO_SETTINGS_MODULE=%(projectname).settings
+env = DJANGO_SETTINGS_MODULE=%(projectname).settings.production
pythonpath = %(base)
module = %(projectname).wsgi
socket = /var/lib/uwsgi/run/%(projectname).sock