|
@@ -60,6 +60,7 @@ xmpp_variables=(ONION_ONLY
|
60
|
60
|
XMPP_ECC_CURVE
|
61
|
61
|
XMPP_ECC_CURVE
|
62
|
62
|
MY_USERNAME
|
|
63
|
+ MY_EMAIL_ADDRESS
|
63
|
64
|
DEFAULT_DOMAIN_NAME
|
64
|
65
|
XMPP_DOMAIN_CODE)
|
65
|
66
|
|
|
@@ -431,6 +432,7 @@ function upgrade_xmpp {
|
431
|
432
|
function_check update_prosody_modules
|
432
|
433
|
update_prosody_modules
|
433
|
434
|
xmpp_onion_addresses /etc/prosody/prosody.cfg.lua
|
|
435
|
+ xmpp_contact_info /etc/prosody/prosody.cfg.lua
|
434
|
436
|
|
435
|
437
|
if grep -q "/etc/ssl/certs/xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then
|
436
|
438
|
cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam
|
|
@@ -658,10 +660,27 @@ function xmpp_email_headers {
|
658
|
660
|
done
|
659
|
661
|
}
|
660
|
662
|
|
|
663
|
+function xmpp_contact_info {
|
|
664
|
+ filename="$1"
|
|
665
|
+
|
|
666
|
+ if grep -q "contact_info =" "$filename"; then
|
|
667
|
+ return
|
|
668
|
+ fi
|
|
669
|
+
|
|
670
|
+ { 'contact_info = {';
|
|
671
|
+ "abuse = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
|
|
672
|
+ "admin = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
|
|
673
|
+ "feedback = { \"mailto:${MY_EMAIL_ADDRESS}\", \"xmpp:${USERNAME}@${HOSTNAME}\" };";
|
|
674
|
+ "security = { \"xmpp:${USERNAME}@${HOSTNAME}\" };";
|
|
675
|
+ "support = { \"xmpp:${USERNAME}@${HOSTNAME}\" };";
|
|
676
|
+ '};'; } >> "$filename"
|
|
677
|
+}
|
|
678
|
+
|
661
|
679
|
function xmpp_modules {
|
662
|
680
|
filename="$1"
|
663
|
681
|
|
664
|
682
|
{ echo 'modules_enabled = {';
|
|
683
|
+ echo ' "server_contact_info";';
|
665
|
684
|
echo ' "pubsub";';
|
666
|
685
|
echo ' "pubsub_hub";';
|
667
|
686
|
echo ' "dialback"; -- s2s dialback support';
|
|
@@ -754,6 +773,7 @@ function xmpp_create_config {
|
754
|
773
|
xmpp_modules /etc/prosody/prosody.cfg.lua
|
755
|
774
|
echo '' >> /etc/prosody/prosody.cfg.lua
|
756
|
775
|
xmpp_onion_addresses /etc/prosody/prosody.cfg.lua
|
|
776
|
+ xmpp_contact_info /etc/prosody/prosody.cfg.lua
|
757
|
777
|
{ echo '';
|
758
|
778
|
echo 'allow_registration = false;';
|
759
|
779
|
echo '';
|