From 088ea2bd63e1a22c2968f3bf8ae7a4387e66ba14 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 10 Feb 2020 15:59:04 +0100
Subject: Adapt for management with multiple packages

---
 install/ishtar-prepare-instance        | 10 ++++++++++
 install/libreoffice_settings.py.sample |  1 +
 install/local_settings.py.sample       | 10 ++++++++++
 install/tasks_settings.py.sample       |  1 +
 4 files changed, 22 insertions(+)
 create mode 100644 install/libreoffice_settings.py.sample
 create mode 100644 install/tasks_settings.py.sample

(limited to 'install')

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
-- 
cgit v1.2.3