diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-03-08 14:26:10 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | ac02eeb7de1f734352c7013694d8f8346758c26a (patch) | |
| tree | 87bba7046a267dd105c1bdb975a66bddfde2149d /install | |
| parent | 10fb6fc7b37cd922be713df61625506db678faa6 (diff) | |
| download | Ishtar-ac02eeb7de1f734352c7013694d8f8346758c26a.tar.bz2 Ishtar-ac02eeb7de1f734352c7013694d8f8346758c26a.zip | |
Install script: fix uwsgi and extra settings conf
Diffstat (limited to 'install')
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 5 | ||||
| -rw-r--r-- | install/uwsgi.ini.template | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index 64853932f..e635dffef 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -277,7 +277,7 @@ EOF "$INSTANCE/local_settings.py" if [ -f $CONFIG_PATH"extra_settings.py" ]; then - cat $CONFIG_PATH"extra_settings.py" >> "$INSTANCE/local_settings.py" + ln -s $CONFIG_PATH"extra_settings.py" >> "$INSTANCE/extra_settings.py" fi ### UWSGI diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 93ccdc01a..aecad17a6 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -35,3 +35,8 @@ DATABASES = { 'PASSWORD': '#DB_PASSWORD#', } } + +try: + from extra_settings import * +except ImportError as e: + print('Unable to load extra_settings.py:', e) diff --git a/install/uwsgi.ini.template b/install/uwsgi.ini.template index 51a4c5b7f..915087258 100644 --- a/install/uwsgi.ini.template +++ b/install/uwsgi.ini.template @@ -10,6 +10,7 @@ master = true protocol = uwsgi env = DJANGO_SETTINGS_MODULE=%(projectname).settings pythonpath = %(base) +pythonpath = %(base)/%(projectname) module = %(projectname).wsgi socket = 127.0.0.1:#UWSGI_PORT# logto = /var/log/django/uwsgi-%(projectname).log |