Remove "ping" in ViarualHosts (#1728)

It's already present in the global modules_enabled and thus loaded for
each VirtualHost.
pull/1343/head^2
bgrozev 10 months ago committed by GitHub
parent 14efd9cc6d
commit bb69407602
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      prosody/rootfs/defaults/conf.d/brewery.cfg.lua
  2. 6
      prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
  3. 2
      prosody/rootfs/defaults/conf.d/visitors.cfg.lua

@ -13,9 +13,6 @@ admins = {
plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" } plugin_paths = { "/prosody-plugins/", "/prosody-plugins-custom" }
VirtualHost "{{ $JVB_XMPP_AUTH_DOMAIN }}" VirtualHost "{{ $JVB_XMPP_AUTH_DOMAIN }}"
modules_enabled = {
"ping";
}
authentication = "internal_hashed" authentication = "internal_hashed"
ssl = { ssl = {
key = "/config/certs/{{ $JVB_XMPP_AUTH_DOMAIN }}.key"; key = "/config/certs/{{ $JVB_XMPP_AUTH_DOMAIN }}.key";
@ -24,7 +21,6 @@ VirtualHost "{{ $JVB_XMPP_AUTH_DOMAIN }}"
Component "{{ $JVB_XMPP_INTERNAL_MUC_DOMAIN }}" "muc" Component "{{ $JVB_XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
modules_enabled = { modules_enabled = {
"ping",
"muc_hide_all"; "muc_hide_all";
"muc_filter_access"; "muc_filter_access";
} }

@ -130,7 +130,6 @@ smacks_max_old_sessions = 1;
{{ if $ENABLE_JAAS_COMPONENTS }} {{ if $ENABLE_JAAS_COMPONENTS }}
VirtualHost "jigasi.meet.jitsi" VirtualHost "jigasi.meet.jitsi"
modules_enabled = { modules_enabled = {
"ping";
"bosh"; "bosh";
"muc_password_check"; "muc_password_check";
} }
@ -196,7 +195,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
"websocket"; "websocket";
"smacks"; -- XEP-0198: Stream Management "smacks"; -- XEP-0198: Stream Management
{{ end }} {{ end }}
"ping";
"speakerstats"; "speakerstats";
"conference_duration"; "conference_duration";
"room_metadata"; "room_metadata";
@ -271,7 +269,6 @@ VirtualHost "{{ $XMPP_DOMAIN }}"
VirtualHost "{{ $XMPP_GUEST_DOMAIN }}" VirtualHost "{{ $XMPP_GUEST_DOMAIN }}"
authentication = "{{ $GUEST_AUTH_TYPE }}" authentication = "{{ $GUEST_AUTH_TYPE }}"
modules_enabled = { modules_enabled = {
"ping";
{{ if $ENABLE_XMPP_WEBSOCKET }} {{ if $ENABLE_XMPP_WEBSOCKET }}
"smacks"; -- XEP-0198: Stream Management "smacks"; -- XEP-0198: Stream Management
{{ end }} {{ end }}
@ -291,14 +288,12 @@ VirtualHost "{{ $XMPP_AUTH_DOMAIN }}"
} }
modules_enabled = { modules_enabled = {
"limits_exception"; "limits_exception";
"ping";
} }
authentication = "internal_hashed" authentication = "internal_hashed"
{{ if $ENABLE_RECORDING }} {{ if $ENABLE_RECORDING }}
VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}" VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}"
modules_enabled = { modules_enabled = {
"ping";
"smacks"; "smacks";
} }
authentication = "internal_hashed" authentication = "internal_hashed"
@ -307,7 +302,6 @@ VirtualHost "{{ $XMPP_RECORDER_DOMAIN }}"
Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc" Component "{{ $XMPP_INTERNAL_MUC_DOMAIN }}" "muc"
storage = "memory" storage = "memory"
modules_enabled = { modules_enabled = {
"ping";
{{ if .Env.XMPP_INTERNAL_MUC_MODULES -}} {{ if .Env.XMPP_INTERNAL_MUC_MODULES -}}
"{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES) }}"; "{{ join "\";\n\"" (splitList "," .Env.XMPP_INTERNAL_MUC_MODULES) }}";
{{ end -}} {{ end -}}

@ -112,7 +112,6 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
} }
modules_enabled = { modules_enabled = {
'bosh'; 'bosh';
'ping';
"external_services"; "external_services";
{{ if $ENABLE_XMPP_WEBSOCKET -}} {{ if $ENABLE_XMPP_WEBSOCKET -}}
"websocket"; "websocket";
@ -134,7 +133,6 @@ VirtualHost 'v{{ $VISITOR_INDEX }}.{{ $VISITORS_XMPP_DOMAIN }}'
VirtualHost '{{ $XMPP_AUTH_DOMAIN}}' VirtualHost '{{ $XMPP_AUTH_DOMAIN}}'
modules_enabled = { modules_enabled = {
'limits_exception'; 'limits_exception';
'ping';
} }
authentication = 'internal_hashed' authentication = 'internal_hashed'

Loading…
Cancel
Save