Browse Source

Consistent formatting/indentation of files in ./doc (#8178)

* unify indentations (debian)

* unify indentations in example-config-files
j8
Christopher Engelhard 4 years ago
parent
commit
32fb08c56f
No account linked to committer's email address

+ 37
- 37
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example View File

6
 turncredentials_secret = "__turnSecret__";
6
 turncredentials_secret = "__turnSecret__";
7
 
7
 
8
 turncredentials = {
8
 turncredentials = {
9
-  { type = "stun", host = "jitmeet.example.com", port = "3478" },
10
-  { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
11
-  { type = "turns", host = "jitmeet.example.com", port = "5349", transport = "tcp" }
9
+    { type = "stun", host = "jitmeet.example.com", port = "3478" },
10
+    { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
11
+    { type = "turns", host = "jitmeet.example.com", port = "5349", transport = "tcp" }
12
 };
12
 };
13
 
13
 
14
 cross_domain_bosh = false;
14
 cross_domain_bosh = false;
17
 
17
 
18
 -- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
18
 -- https://ssl-config.mozilla.org/#server=haproxy&version=2.1&config=intermediate&openssl=1.1.0g&guideline=5.4
19
 ssl = {
19
 ssl = {
20
-  protocol = "tlsv1_2+";
21
-  ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
20
+    protocol = "tlsv1_2+";
21
+    ciphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"
22
 }
22
 }
23
 
23
 
24
 VirtualHost "jitmeet.example.com"
24
 VirtualHost "jitmeet.example.com"
25
-        -- enabled = false -- Remove this line to enable this host
26
-        authentication = "anonymous"
27
-        -- Properties below are modified by jitsi-meet-tokens package config
28
-        -- and authentication above is switched to "token"
29
-        --app_id="example_app_id"
30
-        --app_secret="example_app_secret"
31
-        -- Assign this host a certificate for TLS, otherwise it would use the one
32
-        -- set in the global section (if any).
33
-        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
34
-        -- use the global one.
35
-        ssl = {
36
-                key = "/etc/prosody/certs/jitmeet.example.com.key";
37
-                certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
38
-        }
39
-        speakerstats_component = "speakerstats.jitmeet.example.com"
40
-        conference_duration_component = "conferenceduration.jitmeet.example.com"
41
-        -- we need bosh
42
-        modules_enabled = {
43
-            "bosh";
44
-            "pubsub";
45
-            "ping"; -- Enable mod_ping
46
-            "speakerstats";
47
-            "turncredentials";
48
-            "conference_duration";
49
-            "muc_lobby_rooms";
50
-        }
51
-        c2s_require_encryption = false
52
-        lobby_muc = "lobby.jitmeet.example.com"
53
-        main_muc = "conference.jitmeet.example.com"
54
-        -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
25
+    -- enabled = false -- Remove this line to enable this host
26
+    authentication = "anonymous"
27
+    -- Properties below are modified by jitsi-meet-tokens package config
28
+    -- and authentication above is switched to "token"
29
+    --app_id="example_app_id"
30
+    --app_secret="example_app_secret"
31
+    -- Assign this host a certificate for TLS, otherwise it would use the one
32
+    -- set in the global section (if any).
33
+    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
34
+    -- use the global one.
35
+    ssl = {
36
+        key = "/etc/prosody/certs/jitmeet.example.com.key";
37
+        certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
38
+    }
39
+    speakerstats_component = "speakerstats.jitmeet.example.com"
40
+    conference_duration_component = "conferenceduration.jitmeet.example.com"
41
+    -- we need bosh
42
+    modules_enabled = {
43
+        "bosh";
44
+        "pubsub";
45
+        "ping"; -- Enable mod_ping
46
+        "speakerstats";
47
+        "turncredentials";
48
+        "conference_duration";
49
+        "muc_lobby_rooms";
50
+    }
51
+    c2s_require_encryption = false
52
+    lobby_muc = "lobby.jitmeet.example.com"
53
+    main_muc = "conference.jitmeet.example.com"
54
+    -- muc_lobby_whitelist = { "recorder.jitmeet.example.com" } -- Here we can whitelist jibri to enter lobby enabled rooms
55
 
55
 
56
 Component "conference.jitmeet.example.com" "muc"
56
 Component "conference.jitmeet.example.com" "muc"
57
     storage = "memory"
57
     storage = "memory"
58
     modules_enabled = {
58
     modules_enabled = {
59
         "muc_meeting_id";
59
         "muc_meeting_id";
60
         "muc_domain_mapper";
60
         "muc_domain_mapper";
61
-        -- "token_verification";
61
+        --"token_verification";
62
     }
62
     }
63
     admins = { "focusUser@auth.jitmeet.example.com" }
63
     admins = { "focusUser@auth.jitmeet.example.com" }
64
     muc_room_locking = false
64
     muc_room_locking = false
68
 Component "internal.auth.jitmeet.example.com" "muc"
68
 Component "internal.auth.jitmeet.example.com" "muc"
69
     storage = "memory"
69
     storage = "memory"
70
     modules_enabled = {
70
     modules_enabled = {
71
-      "ping";
71
+        "ping";
72
     }
72
     }
73
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
73
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
74
     muc_room_locking = false
74
     muc_room_locking = false

+ 17
- 17
doc/debian/jitsi-meet/jitsi-meet.example View File

6
     server_name jitsi-meet.example.com;
6
     server_name jitsi-meet.example.com;
7
 
7
 
8
     location ^~ /.well-known/acme-challenge/ {
8
     location ^~ /.well-known/acme-challenge/ {
9
-       default_type "text/plain";
10
-       root         /usr/share/jitsi-meet;
9
+        default_type "text/plain";
10
+        root         /usr/share/jitsi-meet;
11
     }
11
     }
12
     location = /.well-known/acme-challenge/ {
12
     location = /.well-known/acme-challenge/ {
13
-       return 404;
13
+        return 404;
14
     }
14
     }
15
     location / {
15
     location / {
16
-       return 301 https://$host$request_uri;
16
+        return 301 https://$host$request_uri;
17
     }
17
     }
18
 }
18
 }
19
 server {
19
 server {
21
     listen [::]:443 ssl;
21
     listen [::]:443 ssl;
22
     server_name jitsi-meet.example.com;
22
     server_name jitsi-meet.example.com;
23
 
23
 
24
-# Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
24
+    # Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
25
     ssl_protocols TLSv1.2 TLSv1.3;
25
     ssl_protocols TLSv1.2 TLSv1.3;
26
     ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
26
     ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
27
     ssl_prefer_server_ciphers off;
27
     ssl_prefer_server_ciphers off;
58
         alias /usr/share/jitsi-meet/libs/external_api.min.js;
58
         alias /usr/share/jitsi-meet/libs/external_api.min.js;
59
     }
59
     }
60
 
60
 
61
-    #ensure all static content can always be found first
61
+    # ensure all static content can always be found first
62
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
62
     location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
63
     {
63
     {
64
         add_header 'Access-Control-Allow-Origin' '*';
64
         add_header 'Access-Control-Allow-Origin' '*';
66
 
66
 
67
         # cache all versioned files
67
         # cache all versioned files
68
         if ($arg_v) {
68
         if ($arg_v) {
69
-          expires 1y;
69
+            expires 1y;
70
         }
70
         }
71
     }
71
     }
72
 
72
 
73
     # BOSH
73
     # BOSH
74
     location = /http-bind {
74
     location = /http-bind {
75
-        proxy_pass      http://localhost:5280/http-bind;
75
+        proxy_pass       http://localhost:5280/http-bind;
76
         proxy_set_header X-Forwarded-For $remote_addr;
76
         proxy_set_header X-Forwarded-For $remote_addr;
77
         proxy_set_header Host $http_host;
77
         proxy_set_header Host $http_host;
78
     }
78
     }
89
 
89
 
90
     # colibri (JVB) websockets for jvb1
90
     # colibri (JVB) websockets for jvb1
91
     location ~ ^/colibri-ws/default-id/(.*) {
91
     location ~ ^/colibri-ws/default-id/(.*) {
92
-       proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
93
-       proxy_http_version 1.1;
94
-       proxy_set_header Upgrade $http_upgrade;
95
-       proxy_set_header Connection "upgrade";
96
-       tcp_nodelay on;
92
+        proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args;
93
+        proxy_http_version 1.1;
94
+        proxy_set_header Upgrade $http_upgrade;
95
+        proxy_set_header Connection "upgrade";
96
+        tcp_nodelay on;
97
     }
97
     }
98
 
98
 
99
     location ~ ^/([^/?&:'"]+)$ {
99
     location ~ ^/([^/?&:'"]+)$ {
106
 
106
 
107
     location ~ ^/([^/?&:'"]+)/config.js$
107
     location ~ ^/([^/?&:'"]+)/config.js$
108
     {
108
     {
109
-       set $subdomain "$1.";
110
-       set $subdir "$1/";
109
+        set $subdomain "$1.";
110
+        set $subdir "$1/";
111
 
111
 
112
-       alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
112
+        alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
113
     }
113
     }
114
 
114
 
115
-    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
115
+    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
116
     location ~ ^/([^/?&:'"]+)/(.*)$ {
116
     location ~ ^/([^/?&:'"]+)/(.*)$ {
117
         set $subdomain "$1.";
117
         set $subdomain "$1.";
118
         set $subdir "$1/";
118
         set $subdir "$1/";

+ 34
- 35
doc/debian/jitsi-meet/jitsi-meet.example-apache View File

8
 </VirtualHost>
8
 </VirtualHost>
9
 
9
 
10
 <VirtualHost *:443>
10
 <VirtualHost *:443>
11
+    ServerName jitsi-meet.example.com
11
 
12
 
12
-  ServerName jitsi-meet.example.com
13
-
14
-  # enable HTTP/2, if available
15
-  Protocols h2 http/1.1
13
+    # enable HTTP/2, if available
14
+    Protocols h2 http/1.1
16
 
15
 
17
-  SSLEngine on
18
-  SSLProxyEngine on
19
-  SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
20
-  SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
16
+    SSLEngine on
17
+    SSLProxyEngine on
18
+    SSLCertificateFile /etc/jitsi/meet/jitsi-meet.example.com.crt
19
+    SSLCertificateKeyFile /etc/jitsi/meet/jitsi-meet.example.com.key
21
 
20
 
22
-  Header always set Strict-Transport-Security "max-age=63072000"
21
+    Header always set Strict-Transport-Security "max-age=63072000"
23
 
22
 
24
-  DocumentRoot "/usr/share/jitsi-meet"
25
-  <Directory "/usr/share/jitsi-meet">
26
-    Options Indexes MultiViews Includes FollowSymLinks
27
-    AddOutputFilter Includes html
28
-    AllowOverride All
29
-    Order allow,deny
30
-    Allow from all
31
-  </Directory>
23
+    DocumentRoot "/usr/share/jitsi-meet"
24
+    <Directory "/usr/share/jitsi-meet">
25
+        Options Indexes MultiViews Includes FollowSymLinks
26
+        AddOutputFilter Includes html
27
+        AllowOverride All
28
+        Order allow,deny
29
+        Allow from all
30
+    </Directory>
32
 
31
 
33
-  ErrorDocument 404 /static/404.html
32
+    ErrorDocument 404 /static/404.html
34
 
33
 
35
-  Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
36
-  <Location /config.js>
37
-    Require all granted
38
-  </Location>
34
+    Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
35
+    <Location /config.js>
36
+        Require all granted
37
+    </Location>
39
 
38
 
40
-  Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
41
-  <Location /external_api.js>
42
-    Require all granted
43
-  </Location>
39
+    Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
40
+    <Location /external_api.js>
41
+        Require all granted
42
+    </Location>
44
 
43
 
45
-  ProxyPreserveHost on
46
-  ProxyPass /http-bind http://localhost:5280/http-bind/
47
-  ProxyPassReverse /http-bind http://localhost:5280/http-bind/
44
+    ProxyPreserveHost on
45
+    ProxyPass /http-bind http://localhost:5280/http-bind/
46
+    ProxyPassReverse /http-bind http://localhost:5280/http-bind/
48
 
47
 
49
-  RewriteEngine on
50
-  RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
48
+    RewriteEngine on
49
+    RewriteRule ^/([a-zA-Z0-9]+)$ /index.html
51
 </VirtualHost>
50
 </VirtualHost>
52
 
51
 
53
 # Mozilla Guideline v5.4, Apache 2.4.41, OpenSSL 1.1.1d, intermediate configuration, no OCSP
52
 # Mozilla Guideline v5.4, Apache 2.4.41, OpenSSL 1.1.1d, intermediate configuration, no OCSP
54
-SSLProtocol             all -SSLv3 -TLSv1 -TLSv1.1
55
-SSLCipherSuite          ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
56
-SSLHonorCipherOrder     off
57
-SSLSessionTickets       off
53
+SSLProtocol         all -SSLv3 -TLSv1 -TLSv1.1
54
+SSLCipherSuite      ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
55
+SSLHonorCipherOrder off
56
+SSLSessionTickets   off

+ 4
- 5
doc/example-config-files/multidomain/jitsi.example.com.multidomain.example View File

10
     index index.html;
10
     index index.html;
11
     set $prefix "";
11
     set $prefix "";
12
 
12
 
13
-
14
     # BOSH
13
     # BOSH
15
     location /http-bind {
14
     location /http-bind {
16
         proxy_pass      http://localhost:5280/http-bind;
15
         proxy_pass      http://localhost:5280/http-bind;
44
 
43
 
45
     location ~ ^/([^/?&:'"]+)/config.js$
44
     location ~ ^/([^/?&:'"]+)/config.js$
46
     {
45
     {
47
-       set $subdomain "$1.";
48
-       set $subdir "$1/";
46
+        set $subdomain "$1.";
47
+        set $subdir "$1/";
49
 
48
 
50
-       alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
49
+        alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
51
     }
50
     }
52
 
51
 
53
-    #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
52
+    # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
54
     location ~ ^/([^/?&:'"]+)/(.*)$ {
53
     location ~ ^/([^/?&:'"]+)/(.*)$ {
55
         set $subdomain "$1.";
54
         set $subdomain "$1.";
56
         set $subdir "$1/";
55
         set $subdir "$1/";

+ 76
- 73
doc/example-config-files/multidomain/prosody.cfg.multidomain.example View File

34
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
34
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
35
 modules_enabled = {
35
 modules_enabled = {
36
 
36
 
37
-	-- Generally required
38
-		"roster"; -- Allow users to have a roster. Recommended ;)
39
-		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
40
-		"tls"; -- Add support for secure TLS on c2s/s2s connections
41
-		"dialback"; -- s2s dialback support
42
-		"disco"; -- Service discovery
43
-		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
44
-
45
-	-- Not essential, but recommended
46
-		"private"; -- Private XML storage (for room bookmarks, etc.)
47
-		"vcard"; -- Allow users to set vCards
48
-
49
-	-- These are commented by default as they have a performance impact
50
-		--"privacy"; -- Support privacy lists
51
-		"compression"; -- Stream compression (requires the lua-zlib package installed)
52
-
53
-	-- Nice to have
54
-		"version"; -- Replies to server version requests
55
-		"uptime"; -- Report how long server has been running
56
-		"time"; -- Let others know the time here on this server
57
-		"ping"; -- Replies to XMPP pings with pongs
58
-		"pep"; -- Enables users to publish their mood, activity, playing music and more
59
-		"register"; -- Allow users to register on this server using a client and change passwords
60
-
61
-	-- Admin interfaces
62
-		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
63
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
64
-
65
-	-- HTTP modules
66
-		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
67
-		--"http_files"; -- Serve static files from a directory over HTTP
68
-
69
-	-- Other specific functionality
70
-		--"groups"; -- Shared roster support
71
-		--"announce"; -- Send announcement to all online users
72
-		--"welcome"; -- Welcome users who register accounts
73
-		--"watchregistrations"; -- Alert admins of registrations
74
-		--"motd"; -- Send a message to users when they log in
75
-		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
76
-	-- jitsi
77
-		"smacks";
78
-		"carbons";
79
-		"mam";
80
-		"lastactivity";
81
-		"offline";
82
-		"pubsub";
83
-		"adhoc";
84
-		"websocket";
85
-		"http_altconnect";
37
+    -- Generally required
38
+    "roster"; -- Allow users to have a roster. Recommended ;)
39
+    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
40
+    "tls"; -- Add support for secure TLS on c2s/s2s connections
41
+    "dialback"; -- s2s dialback support
42
+    "disco"; -- Service discovery
43
+    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
44
+
45
+    -- Not essential, but recommended
46
+    "private"; -- Private XML storage (for room bookmarks, etc.)
47
+    "vcard"; -- Allow users to set vCards
48
+
49
+    -- These are commented by default as they have a performance impact
50
+    --"privacy"; -- Support privacy lists
51
+    "compression"; -- Stream compression (requires the lua-zlib package installed)
52
+
53
+    -- Nice to have
54
+    "version"; -- Replies to server version requests
55
+    "uptime"; -- Report how long server has been running
56
+    "time"; -- Let others know the time here on this server
57
+    "ping"; -- Replies to XMPP pings with pongs
58
+    "pep"; -- Enables users to publish their mood, activity, playing music and more
59
+    "register"; -- Allow users to register on this server using a client and change passwords
60
+
61
+    -- Admin interfaces
62
+    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
63
+    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
64
+
65
+    -- HTTP modules
66
+    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
67
+    --"http_files"; -- Serve static files from a directory over HTTP
68
+
69
+    -- Other specific functionality
70
+    --"groups"; -- Shared roster support
71
+    --"announce"; -- Send announcement to all online users
72
+    --"welcome"; -- Welcome users who register accounts
73
+    --"watchregistrations"; -- Alert admins of registrations
74
+    --"motd"; -- Send a message to users when they log in
75
+    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
76
+
77
+    -- jitsi
78
+    "smacks";
79
+    "carbons";
80
+    "mam";
81
+    "lastactivity";
82
+    "offline";
83
+    "pubsub";
84
+    "adhoc";
85
+    "websocket";
86
+    "http_altconnect";
86
 }
87
 }
87
 
88
 
88
 -- domain mapper options, must at least have domain base set to use the mapper
89
 -- domain mapper options, must at least have domain base set to use the mapper
91
 -- These modules are auto-loaded, but should you want
92
 -- These modules are auto-loaded, but should you want
92
 -- to disable them then uncomment them here:
93
 -- to disable them then uncomment them here:
93
 modules_disabled = {
94
 modules_disabled = {
94
-	-- "offline"; -- Store offline messages
95
-	-- "c2s"; -- Handle client connections
96
-	-- "s2s"; -- Handle server-to-server connections
95
+    --"offline"; -- Store offline messages
96
+    --"c2s"; -- Handle client connections
97
+    --"s2s"; -- Handle server-to-server connections
97
 }
98
 }
98
 
99
 
99
 -- Disable account creation by default, for security
100
 -- Disable account creation by default, for security
110
 -- Force clients to use encrypted connections? This option will
111
 -- Force clients to use encrypted connections? This option will
111
 -- prevent clients from authenticating unless they are using encryption.
112
 -- prevent clients from authenticating unless they are using encryption.
112
 
113
 
114
+--c2s_require_encryption = true
113
 
115
 
114
 -- Force certificate authentication for server-to-server connections?
116
 -- Force certificate authentication for server-to-server connections?
115
 -- This provides ideal security, but requires servers you communicate
117
 -- This provides ideal security, but requires servers you communicate
118
 -- NOTE: Your version of LuaSec must support certificate verification!
119
 -- NOTE: Your version of LuaSec must support certificate verification!
119
 -- For more information see http://prosody.im/doc/s2s#security
120
 -- For more information see http://prosody.im/doc/s2s#security
120
 
121
 
122
+--s2s_secure_auth = false
121
 
123
 
122
 -- Many servers don't support encryption or have invalid or self-signed
124
 -- Many servers don't support encryption or have invalid or self-signed
123
 -- certificates. You can list domains here that will not be required to
125
 -- certificates. You can list domains here that will not be required to
159
 -- Logging configuration
160
 -- Logging configuration
160
 -- For advanced logging see http://prosody.im/doc/logging
161
 -- For advanced logging see http://prosody.im/doc/logging
161
 log = {
162
 log = {
162
-	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
163
-	error = "/var/log/prosody/prosody.err";
164
-	"*syslog";
163
+    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
164
+    error = "/var/log/prosody/prosody.err";
165
+    "*syslog";
165
 }
166
 }
166
 
167
 
167
 ----------- Virtual hosts -----------
168
 ----------- Virtual hosts -----------
171
 --VirtualHost "localhost"
172
 --VirtualHost "localhost"
172
 
173
 
173
 VirtualHost "jitsi.example.com"
174
 VirtualHost "jitsi.example.com"
174
-	-- enabled = false -- Remove this line to enable this host
175
-	authentication = "anonymous"
176
-	-- Assign this host a certificate for TLS, otherwise it would use the one
177
-	-- set in the global section (if any).
178
-	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
179
-	-- use the global one.
180
-	ssl = {
181
-		key = "/var/lib/prosody/jitsi.example.com.key";
182
-		certificate = "/var/lib/prosody/jitsi.example.com.crt";
183
-	}
184
-
185
-	c2s_require_encryption = false
175
+    -- enabled = false -- Remove this line to enable this host
176
+    authentication = "anonymous"
177
+    -- Assign this host a certificate for TLS, otherwise it would use the one
178
+    -- set in the global section (if any).
179
+    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
180
+    -- use the global one.
181
+    ssl = {
182
+        key = "/var/lib/prosody/jitsi.example.com.key";
183
+        certificate = "/var/lib/prosody/jitsi.example.com.crt";
184
+    }
185
+
186
+    c2s_require_encryption = false
186
 
187
 
187
 VirtualHost "auth.jitsi.example.com"
188
 VirtualHost "auth.jitsi.example.com"
188
-	ssl = {
189
-		key = "/var/lib/prosody/auth.jitsi.example.com.key";
190
-		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
191
-	}
192
-	authentication = "internal_plain"
189
+    ssl = {
190
+        key = "/var/lib/prosody/auth.jitsi.example.com.key";
191
+        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
192
+    }
193
+    authentication = "internal_plain"
193
 
194
 
194
 ------ Components ------
195
 ------ Components ------
195
 -- You can specify components to add hosts that provide special services,
196
 -- You can specify components to add hosts that provide special services,
209
 -- see: http://prosody.im/doc/components#adding_an_external_component
210
 -- see: http://prosody.im/doc/components#adding_an_external_component
210
 --
211
 --
211
 --Component "gateway.example.com"
212
 --Component "gateway.example.com"
212
---	component_secret = "password"
213
+--    component_secret = "password"
213
 
214
 
214
 Component "conference.jitsi.example.com" "muc"
215
 Component "conference.jitsi.example.com" "muc"
215
     modules_enabled = { "muc_domain_mapper" }
216
     modules_enabled = { "muc_domain_mapper" }

+ 76
- 73
doc/example-config-files/prosody.cfg.lua.example View File

34
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
34
 -- Documentation on modules can be found at: http://prosody.im/doc/modules
35
 modules_enabled = {
35
 modules_enabled = {
36
 
36
 
37
-	-- Generally required
38
-		"roster"; -- Allow users to have a roster. Recommended ;)
39
-		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
40
-		"tls"; -- Add support for secure TLS on c2s/s2s connections
41
-		"dialback"; -- s2s dialback support
42
-		"disco"; -- Service discovery
43
-		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
44
-
45
-	-- Not essential, but recommended
46
-		"private"; -- Private XML storage (for room bookmarks, etc.)
47
-		"vcard"; -- Allow users to set vCards
48
-
49
-	-- These are commented by default as they have a performance impact
50
-		--"privacy"; -- Support privacy lists
51
-		"compression"; -- Stream compression (requires the lua-zlib package installed)
52
-
53
-	-- Nice to have
54
-		"version"; -- Replies to server version requests
55
-		"uptime"; -- Report how long server has been running
56
-		"time"; -- Let others know the time here on this server
57
-		"ping"; -- Replies to XMPP pings with pongs
58
-		"pep"; -- Enables users to publish their mood, activity, playing music and more
59
-		"register"; -- Allow users to register on this server using a client and change passwords
60
-
61
-	-- Admin interfaces
62
-		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
63
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
64
-
65
-	-- HTTP modules
66
-		"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
67
-		--"http_files"; -- Serve static files from a directory over HTTP
68
-
69
-	-- Other specific functionality
70
-		--"groups"; -- Shared roster support
71
-		--"announce"; -- Send announcement to all online users
72
-		--"welcome"; -- Welcome users who register accounts
73
-		--"watchregistrations"; -- Alert admins of registrations
74
-		--"motd"; -- Send a message to users when they log in
75
-		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
76
-	-- jitsi
77
-		"smacks";
78
-		"carbons";
79
-		"mam";
80
-		"lastactivity";
81
-		"offline";
82
-		"pubsub";
83
-		"adhoc";
84
-		"websocket";
85
-		"http_altconnect";
37
+    -- Generally required
38
+    "roster"; -- Allow users to have a roster. Recommended ;)
39
+    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
40
+    "tls"; -- Add support for secure TLS on c2s/s2s connections
41
+    "dialback"; -- s2s dialback support
42
+    "disco"; -- Service discovery
43
+    "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
44
+
45
+    -- Not essential, but recommended
46
+    "private"; -- Private XML storage (for room bookmarks, etc.)
47
+    "vcard"; -- Allow users to set vCards
48
+
49
+    -- These are commented by default as they have a performance impact
50
+    --"privacy"; -- Support privacy lists
51
+    "compression"; -- Stream compression (requires the lua-zlib package installed)
52
+
53
+    -- Nice to have
54
+    "version"; -- Replies to server version requests
55
+    "uptime"; -- Report how long server has been running
56
+    "time"; -- Let others know the time here on this server
57
+    "ping"; -- Replies to XMPP pings with pongs
58
+    "pep"; -- Enables users to publish their mood, activity, playing music and more
59
+    "register"; -- Allow users to register on this server using a client and change passwords
60
+
61
+    -- Admin interfaces
62
+    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
63
+    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
64
+
65
+    -- HTTP modules
66
+    "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
67
+    --"http_files"; -- Serve static files from a directory over HTTP
68
+
69
+    -- Other specific functionality
70
+    --"groups"; -- Shared roster support
71
+    --"announce"; -- Send announcement to all online users
72
+    --"welcome"; -- Welcome users who register accounts
73
+    --"watchregistrations"; -- Alert admins of registrations
74
+    --"motd"; -- Send a message to users when they log in
75
+    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
76
+
77
+    -- jitsi
78
+    "smacks";
79
+    "carbons";
80
+    "mam";
81
+    "lastactivity";
82
+    "offline";
83
+    "pubsub";
84
+    "adhoc";
85
+    "websocket";
86
+    "http_altconnect";
86
 }
87
 }
87
 
88
 
88
 -- These modules are auto-loaded, but should you want
89
 -- These modules are auto-loaded, but should you want
89
 -- to disable them then uncomment them here:
90
 -- to disable them then uncomment them here:
90
 modules_disabled = {
91
 modules_disabled = {
91
-	-- "offline"; -- Store offline messages
92
-	-- "c2s"; -- Handle client connections
93
-	-- "s2s"; -- Handle server-to-server connections
92
+    --"offline"; -- Store offline messages
93
+    --"c2s"; -- Handle client connections
94
+    --"s2s"; -- Handle server-to-server connections
94
 }
95
 }
95
 
96
 
96
 -- Disable account creation by default, for security
97
 -- Disable account creation by default, for security
107
 -- Force clients to use encrypted connections? This option will
108
 -- Force clients to use encrypted connections? This option will
108
 -- prevent clients from authenticating unless they are using encryption.
109
 -- prevent clients from authenticating unless they are using encryption.
109
 
110
 
111
+--c2s_require_encryption = true
110
 
112
 
111
 -- Force certificate authentication for server-to-server connections?
113
 -- Force certificate authentication for server-to-server connections?
112
 -- This provides ideal security, but requires servers you communicate
114
 -- This provides ideal security, but requires servers you communicate
115
 -- NOTE: Your version of LuaSec must support certificate verification!
116
 -- NOTE: Your version of LuaSec must support certificate verification!
116
 -- For more information see http://prosody.im/doc/s2s#security
117
 -- For more information see http://prosody.im/doc/s2s#security
117
 
118
 
119
+--s2s_secure_auth = false
118
 
120
 
119
 -- Many servers don't support encryption or have invalid or self-signed
121
 -- Many servers don't support encryption or have invalid or self-signed
120
 -- certificates. You can list domains here that will not be required to
122
 -- certificates. You can list domains here that will not be required to
156
 -- Logging configuration
157
 -- Logging configuration
157
 -- For advanced logging see http://prosody.im/doc/logging
158
 -- For advanced logging see http://prosody.im/doc/logging
158
 log = {
159
 log = {
159
-	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
160
-	error = "/var/log/prosody/prosody.err";
161
-	"*syslog";
160
+    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
161
+    error = "/var/log/prosody/prosody.err";
162
+    "*syslog";
162
 }
163
 }
163
 
164
 
164
 ----------- Virtual hosts -----------
165
 ----------- Virtual hosts -----------
168
 --VirtualHost "localhost"
169
 --VirtualHost "localhost"
169
 
170
 
170
 VirtualHost "jitsi.example.com"
171
 VirtualHost "jitsi.example.com"
171
-	-- enabled = false -- Remove this line to enable this host
172
-	authentication = "anonymous"
173
-	-- Assign this host a certificate for TLS, otherwise it would use the one
174
-	-- set in the global section (if any).
175
-	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
176
-	-- use the global one.
177
-	ssl = {
178
-		key = "/var/lib/prosody/jitsi.example.com.key";
179
-		certificate = "/var/lib/prosody/jitsi.example.com.crt";
180
-	}
181
-
182
-	c2s_require_encryption = false
172
+    -- enabled = false -- Remove this line to enable this host
173
+    authentication = "anonymous"
174
+    -- Assign this host a certificate for TLS, otherwise it would use the one
175
+    -- set in the global section (if any).
176
+    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
177
+    -- use the global one.
178
+    ssl = {
179
+        key = "/var/lib/prosody/jitsi.example.com.key";
180
+        certificate = "/var/lib/prosody/jitsi.example.com.crt";
181
+    }
182
+
183
+    c2s_require_encryption = false
183
 
184
 
184
 VirtualHost "auth.jitsi.example.com"
185
 VirtualHost "auth.jitsi.example.com"
185
-	ssl = {
186
-		key = "/var/lib/prosody/auth.jitsi.example.com.key";
187
-		certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
188
-	}
189
-	authentication = "internal_plain"
186
+    ssl = {
187
+        key = "/var/lib/prosody/auth.jitsi.example.com.key";
188
+        certificate = "/var/lib/prosody/auth.jitsi.example.com.crt";
189
+    }
190
+    authentication = "internal_plain"
190
 
191
 
191
 ------ Components ------
192
 ------ Components ------
192
 -- You can specify components to add hosts that provide special services,
193
 -- You can specify components to add hosts that provide special services,
206
 -- see: http://prosody.im/doc/components#adding_an_external_component
207
 -- see: http://prosody.im/doc/components#adding_an_external_component
207
 --
208
 --
208
 --Component "gateway.example.com"
209
 --Component "gateway.example.com"
209
---	component_secret = "password"
210
+--    component_secret = "password"
210
 
211
 
211
 Component "conference.jitsi.example.com" "muc"
212
 Component "conference.jitsi.example.com" "muc"
212
 
213
 

+ 6
- 1
doc/example-config-files/scalable/jicofo_config.scalable.example View File

24
 JICOFO_OPTS=""
24
 JICOFO_OPTS=""
25
 
25
 
26
 # adds java system props that are passed to jicofo (default are for home and logging config file)
26
 # adds java system props that are passed to jicofo (default are for home and logging config file)
27
-JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties"
27
+JAVA_SYS_PROPS=" \
28
+    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
29
+    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo \
30
+    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
31
+    -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties \
32
+"

+ 31
- 32
doc/example-config-files/scalable/meet.example.com.cfg.lua.scalable.example View File

6
 turncredentials_secret = "turncredentials_secret_test";
6
 turncredentials_secret = "turncredentials_secret_test";
7
 
7
 
8
 turncredentials = {
8
 turncredentials = {
9
-  { type = "stun", host = "meet.example.com", port = "443" },
10
-  { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
11
-  { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
9
+    { type = "stun", host = "meet.example.com", port = "443" },
10
+    { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
11
+    { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
12
 };
12
 };
13
 
13
 
14
 cross_domain_bosh = false;
14
 cross_domain_bosh = false;
15
 consider_bosh_secure = true;
15
 consider_bosh_secure = true;
16
 
16
 
17
 VirtualHost "meet.example.com"
17
 VirtualHost "meet.example.com"
18
-        -- enabled = false -- Remove this line to enable this host
19
-        authentication = "anonymous"
20
-        -- Properties below are modified by jitsi-meet-tokens package config
21
-        -- and authentication above is switched to "token"
22
-        --app_id="example_app_id"
23
-        --app_secret="example_app_secret"
24
-        -- Assign this host a certificate for TLS, otherwise it would use the one
25
-        -- set in the global section (if any).
26
-        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
27
-        -- use the global one.
28
-        ssl = {
29
-                key = "/etc/prosody/certs/meet.example.com.key";
30
-                certificate = "/etc/prosody/certs/meet.example.com.crt";
31
-        }
32
-        speakerstats_component = "speakerstats.meet.example.com"
33
-        conference_duration_component = "conferenceduration.meet.example.com"
34
-        -- we need bosh
35
-        modules_enabled = {
36
-            "bosh";
37
-            "pubsub";
38
-            "ping"; -- Enable mod_ping
39
-            "speakerstats";
40
-            "turncredentials";
41
-            "conference_duration";
42
-        }
43
-        c2s_require_encryption = false
18
+    -- enabled = false -- Remove this line to enable this host
19
+    authentication = "anonymous"
20
+    -- Properties below are modified by jitsi-meet-tokens package config
21
+    -- and authentication above is switched to "token"
22
+    --app_id="example_app_id"
23
+    --app_secret="example_app_secret"
24
+    -- Assign this host a certificate for TLS, otherwise it would use the one
25
+    -- set in the global section (if any).
26
+    -- Note that old-style SSL on port 5223 only supports one certificate, and will always
27
+    -- use the global one.
28
+    ssl = {
29
+        key = "/etc/prosody/certs/meet.example.com.key";
30
+        certificate = "/etc/prosody/certs/meet.example.com.crt";
31
+    }
32
+    speakerstats_component = "speakerstats.meet.example.com"
33
+    conference_duration_component = "conferenceduration.meet.example.com"
34
+    -- we need bosh
35
+    modules_enabled = {
36
+        "bosh";
37
+        "pubsub";
38
+        "ping"; -- Enable mod_ping
39
+        "speakerstats";
40
+        "turncredentials";
41
+        "conference_duration";
42
+    }
43
+    c2s_require_encryption = false
44
 
44
 
45
 Component "conference.meet.example.com" "muc"
45
 Component "conference.meet.example.com" "muc"
46
     storage = "memory"
46
     storage = "memory"
47
     modules_enabled = {
47
     modules_enabled = {
48
         "muc_meeting_id";
48
         "muc_meeting_id";
49
         "muc_domain_mapper";
49
         "muc_domain_mapper";
50
-        -- "token_verification";
50
+        --"token_verification";
51
     }
51
     }
52
     admins = { "focus@auth.meet.example.com" }
52
     admins = { "focus@auth.meet.example.com" }
53
     muc_room_locking = false
53
     muc_room_locking = false
58
 Component "internal.auth.meet.example.com" "muc"
58
 Component "internal.auth.meet.example.com" "muc"
59
     storage = "memory"
59
     storage = "memory"
60
     modules_enabled = {
60
     modules_enabled = {
61
-      "ping";
61
+        "ping";
62
     }
62
     }
63
     admins = { "focus@auth.meet.example.com", "jvb@auth.meet.example.com" }
63
     admins = { "focus@auth.meet.example.com", "jvb@auth.meet.example.com" }
64
 
64
 
75
 Component "speakerstats.meet.example.com" "speakerstats_component"
75
 Component "speakerstats.meet.example.com" "speakerstats_component"
76
     muc_component = "conference.meet.example.com"
76
     muc_component = "conference.meet.example.com"
77
 
77
 
78
-
79
 Component "conferenceduration.meet.example.com" "conference_duration_component"
78
 Component "conferenceduration.meet.example.com" "conference_duration_component"
80
     muc_component = "conference.meet.example.com"
79
     muc_component = "conference.meet.example.com"
81
 
80
 

+ 51
- 53
doc/example-config-files/scalable/prosody.cfg.lua.scalable.example View File

13
 -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
13
 -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
14
 modules_enabled = {
14
 modules_enabled = {
15
 
15
 
16
-	-- Generally required
17
-		"roster"; -- Allow users to have a roster. Recommended ;)
18
-		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
19
-		"tls"; -- Add support for secure TLS on c2s/s2s connections
20
-		"dialback"; -- s2s dialback support
21
-		"disco"; -- Service discovery
22
-
23
-	-- Not essential, but recommended
24
-		"carbons"; -- Keep multiple clients in sync
25
-		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
26
-		"private"; -- Private XML storage (for room bookmarks, etc.)
27
-		"blocklist"; -- Allow users to block communications with other users
28
-		"vcard4"; -- User profiles (stored in PEP)
29
-		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
30
-
31
-	-- Nice to have
32
-		"version"; -- Replies to server version requests
33
-		"uptime"; -- Report how long server has been running
34
-		"time"; -- Let others know the time here on this server
35
-		"ping"; -- Replies to XMPP pings with pongs
36
-		"register"; -- Allow users to register on this server using a client and change passwords
37
-		--"mam"; -- Store messages in an archive and allow users to access it
38
-		--"csi_simple"; -- Simple Mobile optimizations
39
-
40
-	-- Admin interfaces
41
-		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
42
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
43
-
44
-	-- HTTP modules
45
-		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
46
-		--"websocket"; -- XMPP over WebSockets
47
-		--"http_files"; -- Serve static files from a directory over HTTP
48
-
49
-	-- Other specific functionality
50
-		--"limits"; -- Enable bandwidth limiting for XMPP connections
51
-		--"groups"; -- Shared roster support
52
-		--"server_contact_info"; -- Publish contact information for this service
53
-		--"announce"; -- Send announcement to all online users
54
-		--"welcome"; -- Welcome users who register accounts
55
-		--"watchregistrations"; -- Alert admins of registrations
56
-		--"motd"; -- Send a message to users when they log in
57
-		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
58
-		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
16
+    -- Generally required
17
+    "roster"; -- Allow users to have a roster. Recommended ;)
18
+    "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
19
+    "tls"; -- Add support for secure TLS on c2s/s2s connections
20
+    "dialback"; -- s2s dialback support
21
+    "disco"; -- Service discovery
22
+
23
+    -- Not essential, but recommended
24
+    "carbons"; -- Keep multiple clients in sync
25
+    "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
26
+    "private"; -- Private XML storage (for room bookmarks, etc.)
27
+    "blocklist"; -- Allow users to block communications with other users
28
+    "vcard4"; -- User profiles (stored in PEP)
29
+    "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
30
+
31
+    -- Nice to have
32
+    "version"; -- Replies to server version requests
33
+    "uptime"; -- Report how long server has been running
34
+    "time"; -- Let others know the time here on this server
35
+    "ping"; -- Replies to XMPP pings with pongs
36
+    "register"; -- Allow users to register on this server using a client and change passwords
37
+    --"mam"; -- Store messages in an archive and allow users to access it
38
+    --"csi_simple"; -- Simple Mobile optimizations
39
+
40
+    -- Admin interfaces
41
+    "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
42
+    --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
43
+
44
+    -- HTTP modules
45
+    --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
46
+    --"websocket"; -- XMPP over WebSockets
47
+    --"http_files"; -- Serve static files from a directory over HTTP
48
+
49
+    -- Other specific functionality
50
+    --"limits"; -- Enable bandwidth limiting for XMPP connections
51
+    --"groups"; -- Shared roster support
52
+    --"server_contact_info"; -- Publish contact information for this service
53
+    --"announce"; -- Send announcement to all online users
54
+    --"welcome"; -- Welcome users who register accounts
55
+    --"watchregistrations"; -- Alert admins of registrations
56
+    --"motd"; -- Send a message to users when they log in
57
+    --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
58
+    --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
59
 }
59
 }
60
 
60
 
61
 -- These modules are auto-loaded, but should you want
61
 -- These modules are auto-loaded, but should you want
62
 -- to disable them then uncomment them here:
62
 -- to disable them then uncomment them here:
63
 modules_disabled = {
63
 modules_disabled = {
64
-	-- "offline"; -- Store offline messages
65
-	-- "c2s"; -- Handle client connections
66
-	-- "s2s"; -- Handle server-to-server connections
67
-	-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
64
+    --"offline"; -- Store offline messages
65
+    --"c2s"; -- Handle client connections
66
+    --"s2s"; -- Handle server-to-server connections
67
+    --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
68
 }
68
 }
69
 
69
 
70
 -- Disable account creation by default, for security
70
 -- Disable account creation by default, for security
85
 
85
 
86
 s2s_secure_auth = false
86
 s2s_secure_auth = false
87
 
87
 
88
-
89
 -- Required for init scripts and prosodyctl
88
 -- Required for init scripts and prosodyctl
90
 pidfile = "/var/run/prosody/prosody.pid"
89
 pidfile = "/var/run/prosody/prosody.pid"
91
 
90
 
99
 -- Logging configuration
98
 -- Logging configuration
100
 -- For advanced logging see https://prosody.im/doc/logging
99
 -- For advanced logging see https://prosody.im/doc/logging
101
 log = {
100
 log = {
102
-	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
103
-	error = "/var/log/prosody/prosody.err";
104
-	-- "*syslog"; -- Uncomment this for logging to syslog
105
-	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
101
+    info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
102
+    error = "/var/log/prosody/prosody.err";
103
+    --"*syslog"; -- Uncomment this for logging to syslog
104
+    --"*console"; -- Log to the console, useful for debugging with daemonize=false
106
 }
105
 }
107
 
106
 
108
-
109
 -- Location of directory to find certificates in (relative to main config file):
107
 -- Location of directory to find certificates in (relative to main config file):
110
 certificates = "certs"
108
 certificates = "certs"
111
 
109
 

+ 6
- 2
doc/example-config-files/scalable/videobridge_config.scalable.example View File

15
 # extra options to pass to the JVB daemon
15
 # extra options to pass to the JVB daemon
16
 JVB_OPTS="--apis=rest,"
16
 JVB_OPTS="--apis=rest,"
17
 
17
 
18
-
19
 # adds java system props that are passed to jvb (default are for home and logging config file)
18
 # adds java system props that are passed to jvb (default are for home and logging config file)
20
-JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties"
19
+JAVA_SYS_PROPS=" \
20
+    -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi \
21
+    -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge \
22
+    -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi \
23
+    -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties \
24
+"

Loading…
Cancel
Save