diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-02 11:39:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-02 11:39:11 +0200 |
| commit | f174169c926fa3211d654dad7c9c93bc5811d437 (patch) | |
| tree | 0af05dafe5ebfed16626588603af2b8639f38853 /install | |
| parent | f4473cf41854b3f6d469d026d0e82e0795d06ea0 (diff) | |
| download | Ishtar-f174169c926fa3211d654dad7c9c93bc5811d437.tar.bz2 Ishtar-f174169c926fa3211d654dad7c9c93bc5811d437.zip | |
Install script: fix and simplify nginx template
Diffstat (limited to 'install')
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 | ||||
| -rw-r--r-- | install/nginx.conf.template | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index 3b6f25e88..f0956b36b 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -245,8 +245,6 @@ EOF sed -s "s|#APP_NAME#|$INSTANCE|g;\ s|#UWSGI_PORT#|$UWSGI_PORT|g;\ - s|#DB_NAME#|$DB_NAME|g;\ - s|#DATE#|$DATE|g;\ s|#NGINX_PORT#|$NGINX_PORT|g;\ s|#INSTALL_PATH#|$INSTALL_PATH|g;\ s|#URL#|$URL|g;" \ diff --git a/install/nginx.conf.template b/install/nginx.conf.template index 3450671b9..15333393b 100644 --- a/install/nginx.conf.template +++ b/install/nginx.conf.template @@ -6,7 +6,7 @@ server { error_log /var/log/django/#APP_NAME#-error.log; client_max_body_size 20M; - location /static-#DATE#/ { # STATIC_URL + location /static/ { # STATIC_URL alias #INSTALL_PATH#/#APP_NAME#/static/; # STATIC_ROOT expires 30d; } @@ -16,16 +16,6 @@ server { expires 30d; } - location /tinymce/ { - alias /usr/share/tinymce/www/; - expires 30d; - } - - location /javascript/ { - alias /usr/share/javascript/; - expires 30d; - } - location / { include uwsgi_params; uwsgi_pass 127.0.0.1:#UWSGI_PORT#; |