From b89d1e8878b47e0b13af0eff4c281d9ae66657e9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 15 Apr 2017 18:05:22 +0100
Subject: [PATCH] Prepare for the possibility of a pleroma app
---
src/freedombone-app-gnusocial | 2 +-
src/freedombone-app-postactiv | 2 +-
src/freedombone-utils-gnusocialtools | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 87d548aa2..b0e4b5480 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -983,7 +983,7 @@ function install_gnusocial {
else
function_check install_nodejs
install_nodejs pleroma-gnusocial
- install_pleroma "gnusocial" "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE"
+ install_pleroma_front_end "gnusocial" "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE"
install_gnusocial_default_background "gnusocial" "$GNUSOCIAL_DOMAIN_NAME"
sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/static/config.json
fi
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 75dbdf1a9..bf70d950b 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -767,7 +767,7 @@ function install_postactiv {
else
function_check install_nodejs
install_nodejs pleroma-gnusocial
- install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
+ install_pleroma_front_end "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
install_gnusocial_default_background "postactiv" "$POSTACTIV_DOMAIN_NAME"
sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/static/config.json
fi
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index fe0980d4c..a87065817 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -202,7 +202,7 @@ function install_gnusocial_default_background {
fi
}
-function install_pleroma {
+function install_pleroma_front_end {
app_name="$1"
pleroma_domain="$2"
background_url="$3"
@@ -284,7 +284,7 @@ function upgrade_pleroma {
fi
chown -R www-data:www-data /var/www/${domain_name}/htdocs
else
- install_pleroma "${app_name}" "${domain_name}" "${background_url}" "${title}"
+ install_pleroma_front_end "${app_name}" "${domain_name}" "${background_url}" "${title}"
fi
}
--
GitLab