From df2eb819286d776336d9d4798c6d1fe900edd034 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Tue, 21 Apr 2020 16:58:56 +0200
Subject: [PATCH] Bump Sahana build after a bunch of upstream fixes

---
 lxc-apps/safire/app                                   | 4 ++--
 lxc-apps/safire/install.sh                            | 2 +-
 lxc-apps/sahana-demo/app                              | 4 ++--
 lxc-apps/sahana-demo/install.sh                       | 2 +-
 lxc-apps/sahana/app                                   | 4 ++--
 lxc-apps/sahana/image                                 | 2 +-
 lxc-apps/sahana/install.sh                            | 2 +-
 lxc-apps/sahana/install/sahana_data/Spotter/config.py | 4 ++++
 lxc-apps/sambro/app                                   | 4 ++--
 lxc-apps/sambro/install.sh                            | 2 +-
 lxc-apps/share/app                                    | 4 ++--
 lxc-apps/share/install.sh                             | 2 +-
 12 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/lxc-apps/safire/app b/lxc-apps/safire/app
index 3b720f3..9b7fe64 100644
--- a/lxc-apps/safire/app
+++ b/lxc-apps/safire/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200421",
     "meta": {
         "title": "Sahana Eden - SAFIRE",
         "desc-cs": "Řízení humanítární činnosti - Řešení nouzových událostí",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "safire": {
-            "image": "sahana_0.0.1-200403",
+            "image": "sahana_0.0.1-200421",
             "depends": [
                 "safire-postgres"
             ],
diff --git a/lxc-apps/safire/install.sh b/lxc-apps/safire/install.sh
index 41bbb49..8a9de8c 100755
--- a/lxc-apps/safire/install.sh
+++ b/lxc-apps/safire/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/safire/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/safire/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/safire/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200421"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sahana-demo/app b/lxc-apps/sahana-demo/app
index 8ff48f8..58e86b7 100644
--- a/lxc-apps/sahana-demo/app
+++ b/lxc-apps/sahana-demo/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200421",
     "meta": {
         "title": "Sahana Eden - Demo",
         "desc-cs": "Řízení humanítární činnosti - Demo instance",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sahana-demo": {
-            "image": "sahana_0.0.1-200403",
+            "image": "sahana_0.0.1-200421",
             "depends": [
                 "sahana-demo-postgres"
             ],
diff --git a/lxc-apps/sahana-demo/install.sh b/lxc-apps/sahana-demo/install.sh
index 2054237..31d8a86 100755
--- a/lxc-apps/sahana-demo/install.sh
+++ b/lxc-apps/sahana-demo/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana-demo/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana-demo/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana-demo/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200421"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sahana/app b/lxc-apps/sahana/app
index de7d1be..1deca3f 100644
--- a/lxc-apps/sahana/app
+++ b/lxc-apps/sahana/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200421",
     "meta": {
         "title": "Sahana Eden",
         "desc-cs": "Řízení humanítární činnosti",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sahana": {
-            "image": "sahana_0.0.1-200403",
+            "image": "sahana_0.0.1-200421",
             "depends": [
                 "sahana-postgres"
             ],
diff --git a/lxc-apps/sahana/image b/lxc-apps/sahana/image
index 2160650..2e6b1a6 100644
--- a/lxc-apps/sahana/image
+++ b/lxc-apps/sahana/image
@@ -1,4 +1,4 @@
-IMAGE sahana_0.0.1-200403
+IMAGE sahana_0.0.1-200421
 FROM alpine3.11-python3.8_3.8.2-200403
 
 RUN EOF
diff --git a/lxc-apps/sahana/install.sh b/lxc-apps/sahana/install.sh
index da74e1b..a9e5f52 100755
--- a/lxc-apps/sahana/install.sh
+++ b/lxc-apps/sahana/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sahana/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sahana/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sahana/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200421"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/sahana/install/sahana_data/Spotter/config.py b/lxc-apps/sahana/install/sahana_data/Spotter/config.py
index 3bf808f..3715177 100644
--- a/lxc-apps/sahana/install/sahana_data/Spotter/config.py
+++ b/lxc-apps/sahana/install/sahana_data/Spotter/config.py
@@ -1085,6 +1085,10 @@ def config(settings):
     settings.project.hazards = True
     # Uncomment this to enable Indicators in projects
     settings.project.indicators = True
+    # Uncomment this to enable Goals in projects
+    settings.project.goals = True
+    settings.project.outcomes = True
+    settings.project.outputs = True
     # Uncomment this to enable Milestones in projects
     settings.project.milestones = True
     # Uncomment this to use Projects for Activities & Tasks
diff --git a/lxc-apps/sambro/app b/lxc-apps/sambro/app
index 220bc12..3c3c4da 100644
--- a/lxc-apps/sambro/app
+++ b/lxc-apps/sambro/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200421",
     "meta": {
         "title": "Sahana Eden - SAMBRO",
         "desc-cs": "Řízení humanítární činnosti - Centrum hlášení a výstrah",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "sambro": {
-            "image": "sahana_0.0.1-200403",
+            "image": "sahana_0.0.1-200421",
             "depends": [
                 "sambro-postgres"
             ],
diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh
index 5f546d1..545f1fe 100755
--- a/lxc-apps/sambro/install.sh
+++ b/lxc-apps/sambro/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/sambro/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/sambro/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/sambro/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200421"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}
diff --git a/lxc-apps/share/app b/lxc-apps/share/app
index e11800c..ef3ea58 100644
--- a/lxc-apps/share/app
+++ b/lxc-apps/share/app
@@ -1,5 +1,5 @@
 {
-    "version": "0.0.1-200403",
+    "version": "0.0.1-200421",
     "meta": {
         "title": "Sahana Eden - SHARE",
         "desc-cs": "Řízení humanítární činnosti - Úleva a rehabilitace",
@@ -8,7 +8,7 @@
     },
     "containers": {
         "share": {
-            "image": "sahana_0.0.1-200403",
+            "image": "sahana_0.0.1-200421",
             "depends": [
                 "share-postgres"
             ],
diff --git a/lxc-apps/share/install.sh b/lxc-apps/share/install.sh
index 6a7116f..0533a4e 100755
--- a/lxc-apps/share/install.sh
+++ b/lxc-apps/share/install.sh
@@ -5,7 +5,7 @@ set -ev
 POSTGRES_DATA="${VOLUMES_DIR}/share/postgres_data"
 SAHANA_DATA="${VOLUMES_DIR}/share/sahana_data"
 SAHANA_CONF="${VOLUMES_DIR}/share/sahana_conf"
-SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200403"
+SAHANA_LAYER="${LAYERS_DIR}/sahana_0.0.1-200421"
 
 # Create Postgres instance
 install -o 105432 -g 105432 -m 700 -d ${POSTGRES_DATA}