diff options
| author | Cyril Brulebois <cyril@debamax.com> | 2016-04-07 22:16:45 +0200 |
|---|---|---|
| committer | Cyril Brulebois <cyril@debamax.com> | 2016-04-07 23:25:21 +0200 |
| commit | 6219475e063f13963db5fd91afe012b48d8a209e (patch) | |
| tree | af6bc514e4899c48653e253f0e1c396e4c7d3ac6 | |
| parent | 72b4b3311a73ed5c53787b6eafc336462713aecb (diff) | |
| download | Ishtar-6219475e063f13963db5fd91afe012b48d8a209e.tar.bz2 Ishtar-6219475e063f13963db5fd91afe012b48d8a209e.zip | |
Adapt templates for the new paths.
With the instance creation script, one ends up without the two extra
levels expected by the original installation script, so strip the extra
dirs from these templates.
NOTE: Applying this patch to the master or v0.9 branches would break the
install script. The Debian packaging should probably apply this patch at
build time instead.
Signed-off-by: Cyril Brulebois <cyril@debamax.com>
| -rw-r--r-- | install/local_settings.py.sample | 2 | ||||
| -rw-r--r-- | install/nginx.conf.template | 6 | ||||
| -rw-r--r-- | install/uwsgi.ini.template | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 3f37b0e72..3d17d6610 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -14,7 +14,7 @@ LOGFILE = "/var/log/django/ishtar-#APP_NAME#.log" MEDIA_ROOT = "#APP_DIR#/media/" -ODT_TEMPLATE = "#INSTALL_PATH#/ishtar/ishtar_common/static/template.odt" +ODT_TEMPLATE = "#INSTALL_PATH#/ishtar_common/static/template.odt" ADMINS = ( # ('Your Name', 'your_email@domain.com'), diff --git a/install/nginx.conf.template b/install/nginx.conf.template index 8df09e859..a65ce652c 100644 --- a/install/nginx.conf.template +++ b/install/nginx.conf.template @@ -1,18 +1,18 @@ server { listen #NGINX_PORT#; server_name #URL#; - root #INSTALL_PREFIX#/#DB_NAME#/ishtar/; + root #INSTALL_PREFIX#/#APP_NAME#/; access_log /var/log/django/#APP_NAME#-access.log; error_log /var/log/django/#APP_NAME#-error.log; client_max_body_size 20M; location /static-#DATE#/ { # STATIC_URL - alias #INSTALL_PREFIX#/#DB_NAME#/ishtar/#APP_NAME#/static/; # STATIC_ROOT + alias #INSTALL_PREFIX#/#APP_NAME#/static/; # STATIC_ROOT expires 30d; } location /media/ { # MEDIA_URL - alias #INSTALL_PREFIX#/#DB_NAME#/ishtar/#APP_NAME#/media/; # MEDIA_ROOT + alias #INSTALL_PREFIX#/#APP_NAME#/media/; # MEDIA_ROOT expires 30d; } diff --git a/install/uwsgi.ini.template b/install/uwsgi.ini.template index dd8f00480..51a4c5b7f 100644 --- a/install/uwsgi.ini.template +++ b/install/uwsgi.ini.template @@ -2,7 +2,7 @@ # variables projectname = #APP_NAME# projectdomain = #URL# -base = #INSTALL_PREFIX#/#DB_NAME#/ishtar/ +base = #INSTALL_PREFIX# # config plugins = python |