From 49e69bec0196eef0ebee19e6bbcf1a6360f274d8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 3 Sep 2018 21:09:30 +0100
Subject: [PATCH] Update the way that pleroma background is set
---
src/freedombone-app-pleroma | 4 +++-
src/freedombone-utils-gnusocialtools | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma
index 7b4325285..469869b6b 100755
--- a/src/freedombone-app-pleroma
+++ b/src/freedombone-app-pleroma
@@ -504,6 +504,8 @@ function pleroma_create_config {
domain_port=80
fi
+ pleroma_background_image='aurora_borealis.jpg'
+
{ echo 'use Mix.Config';
echo '';
echo 'config :pleroma, Pleroma.Web.Endpoint,';
@@ -551,7 +553,7 @@ function pleroma_create_config {
echo ' logo: "/static/logo.png",';
echo ' logo_mask: true,';
echo ' logo_margin: "0.1em",';
- echo " background: \"/static/aurora_borealis.jpg\",";
+ echo " background: \"/static/$pleroma_background_image\",";
echo ' redirect_root_no_login: "/main/all",';
echo ' redirect_root_login: "/main/friends",';
echo ' show_instance_panel: true,';
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index 357c1f614..1d5241c5f 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -164,11 +164,17 @@ function pleroma_set_background_image_from_url {
cp "bg_custom.${ext}" "static/bg_custom.${ext}"
chown www-data:www-data "static/bg_custom.${ext}"
sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" static/config.json
+ if [ -f "$pleroma_secret" ]; then
+ sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" "$pleroma_secret"
+ fi
fi
if [ -d priv/static/static ]; then
cp "bg_custom.${ext}" "priv/static/static/bg_custom.${ext}"
chown www-data:www-data "priv/static/static/bg_custom.${ext}"
sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" priv/static/static/config.json
+ if [ -f "$pleroma_secret" ]; then
+ sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" "$pleroma_secret"
+ fi
fi
if [[ "$basedir" != "$PLEROMA_DIR" ]]; then
--
GitLab