diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 19:14:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 19:14:16 +0200 |
| commit | 407a51f6ffae6454207dad8a295b5e7b1abfd65f (patch) | |
| tree | 52d60f16cf10c434ab5fedf0e3aaa42e7d545933 /install | |
| parent | 57f8d74874a3c7b572689a8af9e0edfeaa4d1cc7 (diff) | |
| parent | b06b3d263c2f445aab8d80d210be583807a2df34 (diff) | |
| download | Ishtar-407a51f6ffae6454207dad8a295b5e7b1abfd65f.tar.bz2 Ishtar-407a51f6ffae6454207dad8a295b5e7b1abfd65f.zip | |
Merge branch 'wheezy' of https://gitlab.com/cyrilbrulebois/ishtar into wheezy-branch
Diffstat (limited to 'install')
| -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 |