haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

* unify indentations (debian)

* unify indentations in example-config-files
This commit is contained in:
Christopher Engelhard 2021-01-04 15:22:40 +01:00 committed by GitHub
parent 4a3ff8ce2c
commit 32fb08c56f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 319 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ Component "conference.jitmeet.example.com" "muc"
modules_enabled = { modules_enabled = {
"muc_meeting_id"; "muc_meeting_id";
"muc_domain_mapper"; "muc_domain_mapper";
-- "token_verification"; --"token_verification";
} }
admins = { "focusUser@auth.jitmeet.example.com" } admins = { "focusUser@auth.jitmeet.example.com" }
muc_room_locking = false muc_room_locking = false

6
doc/debian/jitsi-meet/jitsi-meet.example
View File

@ -21,7 +21,7 @@ server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name jitsi-meet.example.com; server_name jitsi-meet.example.com;
# Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration # Mozilla Guideline v5.4, nginx 1.17.7, OpenSSL 1.1.1d, intermediate configuration
ssl_protocols TLSv1.2 TLSv1.3; ssl_protocols TLSv1.2 TLSv1.3;
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; 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;
ssl_prefer_server_ciphers off; ssl_prefer_server_ciphers off;
@ -58,7 +58,7 @@ server {
alias /usr/share/jitsi-meet/libs/external_api.min.js; alias /usr/share/jitsi-meet/libs/external_api.min.js;
} }
#ensure all static content can always be found first # ensure all static content can always be found first
location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
{ {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
@ -112,7 +112,7 @@ server {
alias /etc/jitsi/meet/jitsi-meet.example.com-config.js; alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
} }
#Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to / # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
location ~ ^/([^/?&:'"]+)/(.*)$ { location ~ ^/([^/?&:'"]+)/(.*)$ {
set $subdomain "$1."; set $subdomain "$1.";
set $subdir "$1/"; set $subdir "$1/";

1
doc/debian/jitsi-meet/jitsi-meet.example-apache
View File

@ -8,7 +8,6 @@
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerName jitsi-meet.example.com ServerName jitsi-meet.example.com
# enable HTTP/2, if available # enable HTTP/2, if available

3
doc/example-config-files/multidomain/jitsi.example.com.multidomain.example
View File

@ -10,7 +10,6 @@ server {
index index.html; index index.html;
set $prefix ""; set $prefix "";
# BOSH # BOSH
location /http-bind { location /http-bind {
proxy_pass http://localhost:5280/http-bind; proxy_pass http://localhost:5280/http-bind;
@ -50,7 +49,7 @@ server {
alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js; alias /etc/jitsi/meet/{{jitsi_meet_domain_name}}-config.js;
} }
#Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to / # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
location ~ ^/([^/?&:'"]+)/(.*)$ { location ~ ^/([^/?&:'"]+)/(.*)$ {
set $subdomain "$1."; set $subdomain "$1.";
set $subdir "$1/"; set $subdir "$1/";

11
doc/example-config-files/multidomain/prosody.cfg.multidomain.example
View File

@ -73,6 +73,7 @@ modules_enabled = {
--"watchregistrations"; -- Alert admins of registrations --"watchregistrations"; -- Alert admins of registrations
--"motd"; -- Send a message to users when they log in --"motd"; -- Send a message to users when they log in
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-- jitsi -- jitsi
"smacks"; "smacks";
"carbons"; "carbons";
@ -91,9 +92,9 @@ muc_mapper_domain_base = "jitsi.example.com";
-- These modules are auto-loaded, but should you want -- These modules are auto-loaded, but should you want
-- to disable them then uncomment them here: -- to disable them then uncomment them here:
modules_disabled = { modules_disabled = {
-- "offline"; -- Store offline messages --"offline"; -- Store offline messages
-- "c2s"; -- Handle client connections --"c2s"; -- Handle client connections
-- "s2s"; -- Handle server-to-server connections --"s2s"; -- Handle server-to-server connections
} }
-- Disable account creation by default, for security -- Disable account creation by default, for security
@ -110,7 +111,7 @@ ssl = {
-- Force clients to use encrypted connections? This option will -- Force clients to use encrypted connections? This option will
-- prevent clients from authenticating unless they are using encryption. -- prevent clients from authenticating unless they are using encryption.
-- c2s_require_encryption = true --c2s_require_encryption = true
-- Force certificate authentication for server-to-server connections? -- Force certificate authentication for server-to-server connections?
-- This provides ideal security, but requires servers you communicate -- This provides ideal security, but requires servers you communicate
@ -118,7 +119,7 @@ ssl = {
-- NOTE: Your version of LuaSec must support certificate verification! -- NOTE: Your version of LuaSec must support certificate verification!
-- For more information see http://prosody.im/doc/s2s#security -- For more information see http://prosody.im/doc/s2s#security
-- s2s_secure_auth = false --s2s_secure_auth = false
-- Many servers don't support encryption or have invalid or self-signed -- Many servers don't support encryption or have invalid or self-signed
-- certificates. You can list domains here that will not be required to -- certificates. You can list domains here that will not be required to

11
doc/example-config-files/prosody.cfg.lua.example
View File

@ -73,6 +73,7 @@ modules_enabled = {
--"watchregistrations"; -- Alert admins of registrations --"watchregistrations"; -- Alert admins of registrations
--"motd"; -- Send a message to users when they log in --"motd"; -- Send a message to users when they log in
--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-- jitsi -- jitsi
"smacks"; "smacks";
"carbons"; "carbons";
@ -88,9 +89,9 @@ modules_enabled = {
-- These modules are auto-loaded, but should you want -- These modules are auto-loaded, but should you want
-- to disable them then uncomment them here: -- to disable them then uncomment them here:
modules_disabled = { modules_disabled = {
-- "offline"; -- Store offline messages --"offline"; -- Store offline messages
-- "c2s"; -- Handle client connections --"c2s"; -- Handle client connections
-- "s2s"; -- Handle server-to-server connections --"s2s"; -- Handle server-to-server connections
} }
-- Disable account creation by default, for security -- Disable account creation by default, for security
@ -107,7 +108,7 @@ ssl = {
-- Force clients to use encrypted connections? This option will -- Force clients to use encrypted connections? This option will
-- prevent clients from authenticating unless they are using encryption. -- prevent clients from authenticating unless they are using encryption.
-- c2s_require_encryption = true --c2s_require_encryption = true
-- Force certificate authentication for server-to-server connections? -- Force certificate authentication for server-to-server connections?
-- This provides ideal security, but requires servers you communicate -- This provides ideal security, but requires servers you communicate
@ -115,7 +116,7 @@ ssl = {
-- NOTE: Your version of LuaSec must support certificate verification! -- NOTE: Your version of LuaSec must support certificate verification!
-- For more information see http://prosody.im/doc/s2s#security -- For more information see http://prosody.im/doc/s2s#security
-- s2s_secure_auth = false --s2s_secure_auth = false
-- Many servers don't support encryption or have invalid or self-signed -- Many servers don't support encryption or have invalid or self-signed
-- certificates. You can list domains here that will not be required to -- certificates. You can list domains here that will not be required to

7
doc/example-config-files/scalable/jicofo_config.scalable.example
View File

@ -24,4 +24,9 @@ JICOFO_AUTH_PASSWORD=$JICOFO_PASSWORD
JICOFO_OPTS="" JICOFO_OPTS=""
# adds java system props that are passed to jicofo (default are for home and logging config file) # adds java system props that are passed to jicofo (default are for home and logging config file)
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" 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 \
"

3
doc/example-config-files/scalable/meet.example.com.cfg.lua.scalable.example
View File

@ -47,7 +47,7 @@ Component "conference.meet.example.com" "muc"
modules_enabled = { modules_enabled = {
"muc_meeting_id"; "muc_meeting_id";
"muc_domain_mapper"; "muc_domain_mapper";
-- "token_verification"; --"token_verification";
} }
admins = { "focus@auth.meet.example.com" } admins = { "focus@auth.meet.example.com" }
muc_room_locking = false muc_room_locking = false
@ -75,7 +75,6 @@ Component "focus.meet.example.com"
Component "speakerstats.meet.example.com" "speakerstats_component" Component "speakerstats.meet.example.com" "speakerstats_component"
muc_component = "conference.meet.example.com" muc_component = "conference.meet.example.com"
Component "conferenceduration.meet.example.com" "conference_duration_component" Component "conferenceduration.meet.example.com" "conference_duration_component"
muc_component = "conference.meet.example.com" muc_component = "conference.meet.example.com"

14
doc/example-config-files/scalable/prosody.cfg.lua.scalable.example
View File

@ -61,10 +61,10 @@ modules_enabled = {
-- These modules are auto-loaded, but should you want -- These modules are auto-loaded, but should you want
-- to disable them then uncomment them here: -- to disable them then uncomment them here:
modules_disabled = { modules_disabled = {
-- "offline"; -- Store offline messages --"offline"; -- Store offline messages
-- "c2s"; -- Handle client connections --"c2s"; -- Handle client connections
-- "s2s"; -- Handle server-to-server connections --"s2s"; -- Handle server-to-server connections
-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
} }
-- Disable account creation by default, for security -- Disable account creation by default, for security
@ -85,7 +85,6 @@ s2s_require_encryption = true
s2s_secure_auth = false s2s_secure_auth = false
-- Required for init scripts and prosodyctl -- Required for init scripts and prosodyctl
pidfile = "/var/run/prosody/prosody.pid" pidfile = "/var/run/prosody/prosody.pid"
@ -101,11 +100,10 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
log = { log = {
info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
error = "/var/log/prosody/prosody.err"; error = "/var/log/prosody/prosody.err";
-- "*syslog"; -- Uncomment this for logging to syslog --"*syslog"; -- Uncomment this for logging to syslog
-- "*console"; -- Log to the console, useful for debugging with daemonize=false --"*console"; -- Log to the console, useful for debugging with daemonize=false
} }
-- Location of directory to find certificates in (relative to main config file): -- Location of directory to find certificates in (relative to main config file):
certificates = "certs" certificates = "certs"

8
doc/example-config-files/scalable/videobridge_config.scalable.example
View File

@ -15,6 +15,10 @@ JVB_SECRET=$VP_SECRET
# extra options to pass to the JVB daemon # extra options to pass to the JVB daemon
JVB_OPTS="--apis=rest," JVB_OPTS="--apis=rest,"
# adds java system props that are passed to jvb (default are for home and logging config file) # adds java system props that are passed to jvb (default are for home and logging config file)
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" 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 \
"