From 20f0a45baf110a6b5575b2403f6c8cd5dab714c8 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 8 Nov 2022 12:31:24 +0100
Subject: [PATCH 1/3] Automatically install apps specified via env variable.

---
 .env.sample        |  1 +
 compose.yml        |  1 +
 entrypoint.sh.tmpl | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/.env.sample b/.env.sample
index 89587e4..3155405 100644
--- a/.env.sample
+++ b/.env.sample
@@ -19,3 +19,4 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
 
 # X_FRAME_OPTIONS_ENABLED=1
 # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
+# APPS="calendar" "sociallogin" "onlyoffice"
diff --git a/compose.yml b/compose.yml
index f193a40..71c123d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -49,6 +49,7 @@ services:
       - db_password
       - admin_password
     environment:
+      - APPS
       - X_FRAME_OPTIONS_ALLOW_FROM
       - X_FRAME_OPTIONS_ENABLED
       - DOMAIN
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 30d21e8..e8fdaba 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -9,4 +9,25 @@ if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Ht
 fi
 {{ end }}
 
+run_occ(){
+    su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
+}
+
+if [ ! -f /var/www/html/version.php ]
+then
+    # Install nextcloud, without executing php-fpm
+    sed 's/exec "$@"/#exec "$@"/' -i /entrypoint.sh 
+    /entrypoint.sh php-fpm
+    sed 's/#exec "$@"/exec "$@"/' -i /entrypoint.sh 
+fi
+
+installed=$(run_occ status | grep installed | grep true)
+if [[ -n $installed ]]
+then
+    for app in $APPS
+    do
+        run_occ "app:install $app"
+    done
+fi
+
 /entrypoint.sh php-fpm

From 992992d6787b880c2a5259edf159765d2d369b17 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 8 Nov 2022 15:41:37 +0100
Subject: [PATCH 2/3] Revert "Automatically install apps specified via env
 variable." for entrypoint.sh.tmpl

This reverts commit 20f0a45baf110a6b5575b2403f6c8cd5dab714c8 for entrypoint.sh.tmpl
---
 entrypoint.sh.tmpl | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index e8fdaba..30d21e8 100644
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -9,25 +9,4 @@ if ! [[ $(grep {{ env "X_FRAME_OPTIONS_ALLOW_FROM" }} lib/public/AppFramework/Ht
 fi
 {{ end }}
 
-run_occ(){
-    su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
-}
-
-if [ ! -f /var/www/html/version.php ]
-then
-    # Install nextcloud, without executing php-fpm
-    sed 's/exec "$@"/#exec "$@"/' -i /entrypoint.sh 
-    /entrypoint.sh php-fpm
-    sed 's/#exec "$@"/exec "$@"/' -i /entrypoint.sh 
-fi
-
-installed=$(run_occ status | grep installed | grep true)
-if [[ -n $installed ]]
-then
-    for app in $APPS
-    do
-        run_occ "app:install $app"
-    done
-fi
-
 /entrypoint.sh php-fpm

From 827cb16964f367f531d6ae93766c11e4f6388178 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.m@local-it.org>
Date: Tue, 8 Nov 2022 15:46:13 +0100
Subject: [PATCH 3/3] abra.sh post-deployment command to install apps

---
 .env.sample |  3 ++-
 abra.sh     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.env.sample b/.env.sample
index 3155405..415d88d 100644
--- a/.env.sample
+++ b/.env.sample
@@ -19,4 +19,5 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
 
 # X_FRAME_OPTIONS_ENABLED=1
 # X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
-# APPS="calendar" "sociallogin" "onlyoffice"
+# APPS="calendar sociallogin onlyoffice"
+
diff --git a/abra.sh b/abra.sh
index d8dd9df..bcb4af5 100644
--- a/abra.sh
+++ b/abra.sh
@@ -13,6 +13,22 @@ sub_occ(){
   sub_app_run php /var/www/html/occ "$@"
 }
 
+run_occ(){
+    su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
+}
+
+install_apps(){
+    install_apps="$@"
+    if [ -z "$install_apps" ]
+    then
+        install_apps=$APPS
+    fi
+    for app in $install_apps
+    do
+        run_occ "app:install $app"
+    done
+}
+
 _backup_app() {
   # Copied _abra_backup_dir to make UX better on restore and backup
   {