From d145cf739fae264a19ad6b4717593aa466fd3625 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 7 May 2017 19:09:07 +0100
Subject: [PATCH] Use armadillo
---
src/freedombone-utils-gnusocialtools | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index efe4da33f..8cdfdf81d 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -301,7 +301,13 @@ function install_armadillo_front_end {
set_completion_param "${app_name} armadillo commit" "$ARMADILLO_COMMIT"
cp armadillo/config.json.example armadillo/config.json
- sed -i "s|\"server\".*|\"server\": \"${armadillo_domain}\",|g" armadillo/config.json
+ if [[ $ONION_ONLY == 'no' ]]; then
+ sed -i "s|\"server\".*|\"server\": \"https://${armadillo_domain}\",|g" armadillo/config.json
+ else
+ sed -i "s|\"server\".*|\"server\": \"http://${armadillo_domain}\",|g" armadillo/config.json
+ fi
+ owner='<a href=\"'"https://${armadillo_domain}/$MY_USERNAME"'\">@'"$MY_USERNAME@${armadillo_domain}"'</a>'
+ sed -i "s|\"owner\".*|\"$owner\",|g" armadillo/config.json
cp -r $INSTALL_DIR/armadillo/armadillo /var/www/${armadillo_domain}/htdocs/
cp $INSTALL_DIR/armadillo/armadillo.html /var/www/${armadillo_domain}/htdocs/index.html
cp $INSTALL_DIR/armadillo/dash.html /var/www/${armadillo_domain}/htdocs/dash.html
@@ -843,6 +849,7 @@ function gnusocial_use_armadillo {
sed -i "s|// addPlugin('Qvitter')|addPlugin('Qvitter')|g" /var/www/$domain_name/htdocs/config.php
fi
+ cp -r $INSTALL_DIR/armadillo/armadillo/* /var/www/${domain_name}/htdocs/armadillo
cp $INSTALL_DIR/armadillo/armadillo.html /var/www/${domain_name}/htdocs/index.html
cp $INSTALL_DIR/armadillo/dash.html /var/www/${domain_name}/htdocs/dash.html
--
GitLab