Place anti-spam modules behind a flag

There will be no s2s connections on the transport server, so anti-spam modules
won't provide much benefit.

2 files changed, 18 insertions, 4 deletions

diff --git a/files/prosody.cfg.lua.j2 b/files/prosody.cfg.lua.j2
index 332ac32..3ce2342 100644
--- a/files/prosody.cfg.lua.j2
+++ b/files/prosody.cfg.lua.j2
@@ -10,7 +10,6 @@ modules_enabled = {
     "account_activity";
     "admin_adhoc";
     "admin_shell";
-    "anti_spam";
     "blocklist";
     "bookmarks";
     "bosh";
@@ -30,7 +29,6 @@ modules_enabled = {
     "ping";
     "private";
     "proxy65";
-    "report_forward";
     "roster";
     "s2s_auth_dane_in";
     "s2s_bidi";
@@ -43,7 +41,6 @@ modules_enabled = {
     "server_contact_info";
     "server_info";
     "smacks";
-    "spam_reporting";
     "stanza_debug";
     "time";
     "tls";
@@ -51,7 +48,6 @@ modules_enabled = {
     "vcard4";
     "vcard_legacy";
     "version";
-    "watch_spam_reports";
 
     -- Invites
 {% if not is_transport_server %}
@@ -64,6 +60,14 @@ modules_enabled = {
     "turn_external";
 {% endif %}
 
+    -- Spam
+{% if not is_transport_server %}
+    "anti_spam";
+    "report_forward";
+    "spam_reporting";
+    "watch_spam_reports";
+{% endif %}
+
 }
 
 modules_disabled = { }
@@ -85,10 +89,12 @@ c2s_direct_tls_ports = { 5223 }
 s2s_direct_tls_ports = { 5270 }
 use_dane = true
 
+{% if not is_transport_server %}
 anti_spam_services = { "xmppbl.org" }
 report_forward_to = {
     "submit@reports.xmppbl.org";
 }
+{% endif %}
 
 {% if not is_transport_server %}
 turn_external_host = "{{ turn_server }}"
@@ -104,10 +110,12 @@ invite_expiry = 86400 * 365
 registration_invite_only = true
 {% endif %}
 
+{% if not is_transport_server %}
 firewall_scripts = {
   "module:scripts/spam-blocking.pfw";
   "module:script/spam-blocklists.pfw";
 }
+{% endif %}
 
 limits = {
     c2s = {
diff --git a/files/virtual_host.cfg.lua.j2 b/files/virtual_host.cfg.lua.j2
index c21886b..5452481 100644
--- a/files/virtual_host.cfg.lua.j2
+++ b/files/virtual_host.cfg.lua.j2
@@ -53,8 +53,12 @@ Component "conference.{{ virtual_host }}" "muc"
 modules_enabled = {
   "muc";
   "muc_mam";
+
+  -- Spam
+{% if not is_transport_server %}
   "muc_moderation";
   "muc_rtbl";
+{% endif %}
 }
 
 log_all_rooms = true
@@ -62,4 +66,6 @@ restrict_room_creation = "local"
 muc_room_default_public = false
 muc_room_default_public_jids = true
 
+{% if not is_transport_server %}
 muc_rtbl_jid = "xmppbl.org"
+{% endif %}