From 1e5784cd8e34762ce0eee83cdcd68e738d62d755 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 2 Apr 2017 19:34:09 +0100
Subject: [PATCH] update to populate qvitter notifications table
---
src/freedombone-app-gnusocial | 4 +---
src/freedombone-app-postactiv | 14 ++++++++++++--
src/freedombone-utils-gnusocialtools | 5 +++++
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index 65ca6504c..8fdcc6edb 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -470,9 +470,6 @@ function remove_gnusocial {
rm /etc/cron.hourly/gnusocial-daemons
fi
remove_backup_database_local gnusocial
- if [ -d $INSTALL_DIR/pleroma ]; then
- rm -rf $INSTALL_DIR/pleroma
- fi
function_check remove_ddns_domain
remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME
@@ -779,6 +776,7 @@ function install_gnusocial_plugin_sharings {
cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins/Sharings
php scripts/seedsharings.php
cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs
+ php scripts/upgrade.php
php scripts/checkschema.php
# Languages
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index a8b3fd1da..803c662df 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -771,11 +771,21 @@ function install_postactiv {
fi
install_postactiv_main
+ install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
- #install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
#function_check install_nodejs
#install_nodejs pleroma-postactiv
- #install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
+
+ # Currently Pleroma won't install on ARM systems
+ # because it uses node-sass which doesn't support ARM
+ if [[ "$(arch)" == "arm"* ]]; then
+ echo -m $'WARNING: Pleroma currently does not support ARM '
+ echo $'architecture, so it will not be installed'
+ else
+ function_check install_nodejs
+ install_nodejs pleroma-gnusocial
+ install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
+ fi
expire_postactiv_posts
diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools
index f66953cca..55f6601ac 100755
--- a/src/freedombone-utils-gnusocialtools
+++ b/src/freedombone-utils-gnusocialtools
@@ -150,6 +150,11 @@ function install_qvitter {
chown -R www-data:www-data /var/www/${domain_name}/htdocs
+ cd /var/www/${domain_name}/htdocs
+ php scripts/upgrade.php
+ php scripts/checkschema.php
+ chown -R www-data:www-data /var/www/${domain_name}/htdocs
+
set_completion_param "${app_name} theme commit" "$QVITTER_THEME_COMMIT"
install_completed ${app_name}_theme
--
GitLab