diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-02-10 15:59:04 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-07-01 18:02:28 +0200 |
| commit | 088ea2bd63e1a22c2968f3bf8ae7a4387e66ba14 (patch) | |
| tree | 9d92a4fb135862974cf6ef3dbc6d3de3f5f1c6f8 | |
| parent | a7ded053dff84acfb8a3c9073f475843f65fb7b9 (diff) | |
| download | Ishtar-088ea2bd63e1a22c2968f3bf8ae7a4387e66ba14.tar.bz2 Ishtar-088ea2bd63e1a22c2968f3bf8ae7a4387e66ba14.zip | |
Adapt for management with multiple packages
| -rwxr-xr-x | install/ishtar-prepare-instance | 10 | ||||
| -rw-r--r-- | install/libreoffice_settings.py.sample | 1 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 10 | ||||
| -rw-r--r-- | install/tasks_settings.py.sample | 1 |
4 files changed, 22 insertions, 0 deletions
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index d9e4e87af..4b62ec256 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -315,6 +315,16 @@ EOF ln -s $CONFIG_PATH"extra_settings.py" "$DEST/$INSTANCE/extra_settings.py" fi + if [ -f $CONFIG_PATH"tasks_settings.py" ]; then + rm -f "$INSTANCE/tasks_settings.py" + ln -s $CONFIG_PATH"tasks_settings.py" "$DEST/$INSTANCE/tasks_settings.py" + fi + + if [ -f $CONFIG_PATH"libreoffice_settings.py" ]; then + rm -f "$INSTANCE/libreoffice_settings.py" + ln -s $CONFIG_PATH"libreoffice_settings.py" "$DEST/$INSTANCE/libreoffice_settings.py" + fi + ### UWSGI sed -s "s|#APP_NAME#|$INSTANCE|g;\ diff --git a/install/libreoffice_settings.py.sample b/install/libreoffice_settings.py.sample new file mode 100644 index 000000000..6d797e78d --- /dev/null +++ b/install/libreoffice_settings.py.sample @@ -0,0 +1 @@ +USE_LIBREOFFICE = True diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 7c6bac348..0f373ebcf 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -43,3 +43,13 @@ except ImportError as e: from .extra_settings import * # relative import for celery except ImportError as e: print('Unable to load extra_settings.py:', e) + +try: + from tasks_settings import * +except ImportError as e: + pass + +try: + from libreoffice_settings import * +except ImportError as e: + pass diff --git a/install/tasks_settings.py.sample b/install/tasks_settings.py.sample new file mode 100644 index 000000000..252885ed8 --- /dev/null +++ b/install/tasks_settings.py.sample @@ -0,0 +1 @@ +USE_BACKGROUND_TASK = True |