diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-01 23:36:12 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-01 23:36:12 +0200 |
| commit | 0561272f727e1b3cedf582e0c582ed72ea201f98 (patch) | |
| tree | 0cc5098f8bb7da3c3122b82e661b54c5630eefac /install | |
| parent | e43af859f710814f462001bcde5157a4594c59b7 (diff) | |
| parent | ffe1e9dc515daa74aa25f9941c3ac87e2724165e (diff) | |
| download | Ishtar-0561272f727e1b3cedf582e0c582ed72ea201f98.tar.bz2 Ishtar-0561272f727e1b3cedf582e0c582ed72ea201f98.zip | |
Merge branch 'stable'
Diffstat (limited to 'install')
| -rwxr-xr-x | install/install.sh | 1 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/install/install.sh b/install/install.sh index f4ab7f195..9a2ba4094 100755 --- a/install/install.sh +++ b/install/install.sh @@ -136,6 +136,7 @@ APP_DIR=$INSTALL_PATH'/ishtar/'$APP_NAME echo '* load parameters' sed -s "s|#APP_NAME#|$APP_NAME|g;\ + s|#INSTALL_PATH#|$INSTALL_PATH|g;\ s|#DATE#|$DATE|g;\ s|#PROJECT_NAME#|$PROJECT_NAME|g;\ s|#DB_HOST#|$DB_HOST|g;\ diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index cbee9fa85..3f37b0e72 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -14,6 +14,8 @@ LOGFILE = "/var/log/django/ishtar-#APP_NAME#.log" MEDIA_ROOT = "#APP_DIR#/media/" +ODT_TEMPLATE = "#INSTALL_PATH#/ishtar/ishtar_common/static/template.odt" + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) |