summaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rw-r--r--install/local_settings.py.sample2
-rw-r--r--install/nginx.conf.template6
-rw-r--r--install/uwsgi.ini.template2
3 files changed, 5 insertions, 5 deletions
diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample
index 459828c00..857249613 100644
--- a/install/local_settings.py.sample
+++ b/install/local_settings.py.sample
@@ -15,7 +15,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 673135c0e..9711ac261 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