From e729be95a35cdef48a078f759dd36e6bc56e80e8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 14 Mar 2018 19:05:24 +0000
Subject: [PATCH] Install prerequisites for pleroma in social instance

---
 src/freedombone-app-pleroma      | 12 ++++++++++++
 src/freedombone-image-customise  |  2 +-
 src/freedombone-utils-postgresql |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma
index 79dbd77a..fe5d7830 100755
--- a/src/freedombone-app-pleroma
+++ b/src/freedombone-app-pleroma
@@ -938,6 +938,18 @@ function remove_pleroma {
     remove_ddns_domain "$PLEROMA_DOMAIN_NAME"
 }
 
+function image_install_pleroma {
+    if [[ "$SOCIALINSTANCE" != 'pleroma' ]]; then
+        return
+    fi
+
+    # shellcheck disable=SC2154
+    chroot "$rootdir" apt-get -yq install wget imagemagick
+
+    image_install_elixir
+    image_install_postgresql
+}
+
 function install_pleroma {
     if [ ! $ONION_ONLY ]; then
         ONION_ONLY='no'
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 4e1e68c3..18a05abf 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2158,12 +2158,12 @@ create_generic_image
 atheros_wifi
 continue_installation
 image_install_nodejs
-image_install_elixir
 initialise_mesh
 configure_wifi
 configure_user_interface
 image_setup_utils
 image_install_inadyn
+image_install_pleroma
 image_preinstall_repos
 
 # remove downloaded packages
diff --git a/src/freedombone-utils-postgresql b/src/freedombone-utils-postgresql
index 7523a9aa..21b19a47 100755
--- a/src/freedombone-utils-postgresql
+++ b/src/freedombone-utils-postgresql
@@ -49,7 +49,7 @@ function get_postgresql_password {
     fi
 }
 
-function mesh_install_postgresql {
+function image_install_postgresql {
     # shellcheck disable=SC2154,SC2086
     chroot "$rootdir" apt-get -yq install $POSTGRESQL_PACKAGES
 
@@ -66,7 +66,7 @@ function mesh_install_postgresql {
 
 function install_postgresql {
     if [[ $VARIANT == "mesh"* ]]; then
-        mesh_install_postgresql
+        image_install_postgresql
         return
     fi