Skip to content
Snippets Groups Projects
Commit 1b93d5ea authored by Bob Mottram's avatar Bob Mottram
Browse files

Use profile rather than vcard for avatars

parent 5b135d57
No related branches found
No related tags found
No related merge requests found
...@@ -552,12 +552,6 @@ function update_prosody_modules { ...@@ -552,12 +552,6 @@ function update_prosody_modules {
fi fi
fi fi
if ! grep -q '"vcard"' /etc/prosody/prosody.cfg.lua; then
systemctl stop prosody
sed -i '/"pep"/a "vcard";' /etc/prosody/prosody.cfg.lua
systemctl start prosody
xmpp_restart=1
fi
if ! grep -q "omemo_all_access" /etc/prosody/prosody.cfg.lua; then if ! grep -q "omemo_all_access" /etc/prosody/prosody.cfg.lua; then
sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/prosody.cfg.lua sed -i '/"pep";/a "omemo_all_access"; -- Fix for PEP with OMEMO' /etc/prosody/prosody.cfg.lua
sed -i 's|"omemo_all_access";| "omemo_all_access";|g' /etc/prosody/prosody.cfg.lua sed -i 's|"omemo_all_access";| "omemo_all_access";|g' /etc/prosody/prosody.cfg.lua
...@@ -765,6 +759,11 @@ function upgrade_xmpp { ...@@ -765,6 +759,11 @@ function upgrade_xmpp {
# remove any broadcast settings # remove any broadcast settings
prosody_remove_module "broadcast" prosody_remove_module "broadcast"
# handling avatars
prosody_remove_module "pep_vcard_avatar"
prosody_remove_module "vcard"
prosody_add_module "profile"
if grep -q "/etc/ssl/certs/xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then if grep -q "/etc/ssl/certs/xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then
cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam
chown prosody:prosody /etc/prosody/xmpp.dhparam chown prosody:prosody /etc/prosody/xmpp.dhparam
...@@ -1010,9 +1009,8 @@ function xmpp_modules { ...@@ -1010,9 +1009,8 @@ function xmpp_modules {
echo ' "pep"; -- Personal Eventing Protocol (to support OMEMO)'; echo ' "pep"; -- Personal Eventing Protocol (to support OMEMO)';
echo ' "firewall"; -- Block addresses'; echo ' "firewall"; -- Block addresses';
echo ' "omemo_all_access"; -- Fix for PEP with OMEMO'; echo ' "omemo_all_access"; -- Fix for PEP with OMEMO';
echo ' "vcard"; -- Personal Eventing Protocol (to support OMEMO)'; echo ' "profile"; -- Avatars';
echo ' "e2e_policy"; -- To support OMEMO'; echo ' "e2e_policy"; -- To support OMEMO';
echo ' "pep_vcard_avatar"; -- Personal Eventing Protocol (to support OMEMO)';
echo ' "blocklist"; -- Privacy lists'; echo ' "blocklist"; -- Privacy lists';
echo ' "s2s_blacklist"; -- Blacklist particular servers'; echo ' "s2s_blacklist"; -- Blacklist particular servers';
echo ' "privacy_lists"; -- Privacy lists'; echo ' "privacy_lists"; -- Privacy lists';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment