From f322942889c23f1a08d6515d94a30a8c42f4887b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 27 Nov 2018 19:30:56 +0000
Subject: [PATCH] Remove muc logging
---
src/freedombone-app-xmpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 2afb26842..ee4a28958 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -203,10 +203,8 @@ function logging_off_xmpp {
# shellcheck disable=SC2001
prosody_chat_domain_str=$(echo "$prosody_chat_domain" | sed 's|\.|%2e|g')
if [ -d "/var/lib/prosody/${prosody_chat_domain_str}/muc_log" ]; then
- echo "rm -rf /var/lib/prosody/${prosody_chat_domain_str}/muc_log*"
# shellcheck disable=SC2086
rm -rf /var/lib/prosody/${prosody_chat_domain_str}/muc_log*
- ls -lh "/var/lib/prosody/${prosody_chat_domain_str}"
logging_restart_prosody=1
fi
@@ -699,6 +697,16 @@ function upgrade_xmpp {
xmpp_contact_info /etc/prosody/prosody.cfg.lua
xmpp_server_blacklist /etc/prosody/prosody.cfg.lua
+ # remove muc logging
+ if grep -q '"muc_log"' /etc/prosody/prosody.cfg.lua; then
+ sed -i '/"muc_log"/d' /etc/prosody/prosody.cfg.lua
+ xmpp_restart=1
+ fi
+ if grep -q '"muc_log_http"' /etc/prosody/prosody.cfg.lua; then
+ sed -i '/"muc_log_http"/d' /etc/prosody/prosody.cfg.lua
+ xmpp_restart=1
+ fi
+
# remove any broadcast settings
if grep -q '"broadcast"' /etc/prosody/prosody.cfg.lua; then
sed -i '/broadcast/d' /etc/prosody/prosody.cfg.lua
@@ -1251,11 +1259,9 @@ function xmpp_create_config {
echo ' modules_enabled = {';
echo ' "muc_limits";';
echo ' "muc_block_pm";';
- echo ' "muc_log";';
echo ' "tls";';
echo ' "vcard_muc";';
echo ' "s2s_blacklist";';
- echo ' "muc_log_http";';
echo ' }'; } >> /etc/prosody/prosody.cfg.lua
if [[ "$ONION_ONLY" == 'no' ]]; then
--
GitLab