@drumee/setup-infra 1.0.15 → 1.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/create-local-certs +38 -0
- package/bin/env +8 -5
- package/bin/init-acme +23 -4
- package/bin/init-named +1 -1
- package/bin/install +28 -4
- package/bin/prosody +21 -12
- package/index.js +314 -218
- package/package.json +2 -2
- package/templates/etc/bind/named.conf.local +39 -0
- package/templates/etc/bind/named.conf.options +13 -4
- package/templates/etc/dhcp/dhclient.conf +55 -0
- package/templates/etc/drumee/certs/jitsi.private.cnf +13 -0
- package/templates/etc/drumee/certs/private.cnf +13 -0
- package/templates/etc/drumee/conf.d/conference.private.json +9 -0
- package/templates/etc/drumee/conf.d/conference.public.json +9 -0
- package/templates/etc/drumee/conf.d/myDrumee.json.tpl +2 -1
- package/templates/etc/drumee/drumee.sh.tpl +32 -17
- package/templates/etc/drumee/infrastructure/internals/accel.private.conf.tpl +47 -0
- package/templates/etc/drumee/infrastructure/internals/{accel.conf.tpl → accel.public.conf.tpl} +1 -1
- package/templates/etc/drumee/infrastructure/{platform.json.tpl → mfs.private.conf.tpl} +5 -5
- package/templates/etc/drumee/infrastructure/{mfs.conf.tpl → mfs.public.conf.tpl} +1 -1
- package/templates/etc/drumee/infrastructure/routes/private.conf.tpl +143 -0
- package/templates/etc/drumee/infrastructure/routes/{main.conf.tpl → public.conf.tpl} +18 -28
- package/templates/etc/drumee/infrastructure/servers/tt.conf +9 -9
- package/templates/etc/drumee/ssl/private.conf.tpl +2 -1
- package/templates/etc/drumee/ssl/public.conf.tpl +1 -1
- package/templates/etc/jitsi/jicofo/jicofo.private.conf.tpl +46 -0
- package/templates/etc/jitsi/jicofo/{jicofo.conf.tpl → jicofo.public.conf.tpl} +7 -7
- package/templates/etc/jitsi/jicofo/sip-cmmunicator.private.properties +3 -0
- package/templates/etc/jitsi/jicofo/sip-cmmunicator.public.properties +3 -0
- package/templates/etc/jitsi/meet.private.conf.tpl +132 -0
- package/templates/etc/jitsi/{meet.conf.tpl → meet.public.conf.tpl} +5 -5
- package/templates/etc/jitsi/ssl.private.conf.tpl +25 -0
- package/templates/etc/jitsi/{ssl.conf.tpl → ssl.public.conf.tpl} +3 -3
- package/templates/etc/jitsi/videobridge/defaults/jvb.conf +1 -1
- package/templates/etc/jitsi/videobridge/jvb.private.conf +67 -0
- package/templates/etc/jitsi/videobridge/{jvb.conf → jvb.public.conf} +6 -6
- package/templates/etc/jitsi/web/config.private.js.tpl +208 -0
- package/templates/etc/jitsi/web/{config.js.tpl → config.public.js.tpl} +4 -4
- package/templates/etc/jitsi/web/defaults/default +2 -2
- package/templates/etc/jitsi/web/defaults/meet.conf +3 -3
- package/templates/etc/mysql/mariadb.conf.d/50-server.cnf +3 -3
- package/templates/etc/nginx/modules-enabled/{90-turn-relay.conf → 90-turn-relay.private.conf.tpl} +6 -6
- package/templates/etc/nginx/modules-enabled/{90-turn-relay.conf.tpl → 90-turn-relay.public.conf.tpl} +4 -4
- package/templates/etc/nginx/nginx.conf +3 -1
- package/templates/etc/nginx/sites-enabled/{public.conf.tpl → 01-public.conf.tpl} +7 -7
- package/templates/etc/nginx/sites-enabled/{private.conf.tpl → 02-private.conf.tpl} +6 -6
- package/templates/etc/nginx/sites-enabled/{jitsi.conf.tpl → 20-jitsi.private.conf.tpl} +9 -9
- package/templates/etc/nginx/sites-enabled/{pivate.jitsi.conf.tpl → 20-jitsi.public.conf.tpl} +9 -9
- package/templates/etc/nginx/sites-enabled/{localhost.conf → loopback.tpl} +10 -9
- package/templates/etc/nginx/sites-enabled/turnrelay.conf.tpl +4 -4
- package/templates/etc/prosody/conf.d/private.cfg.lua.tpl +51 -51
- package/templates/etc/prosody/conf.d/public.cfg.lua.tpl +47 -47
- package/templates/etc/prosody/defaults/conf.d/jitsi-meet.cfg.lua +3 -3
- package/templates/etc/turnserver.private.conf.tpl +46 -0
- package/templates/etc/{turnserver.conf.tpl → turnserver.public.conf.tpl} +3 -3
- package/templates/index.js +3 -2
- package/templates/utils.js +22 -147
- package/templates/var/lib/bind/domain.tpl +70 -0
- package/templates/var/lib/bind/private-reverse.tpl +1 -1
- package/templates/var/lib/bind/{prvate.tpl → private.tpl} +1 -10
- package/templates/var/lib/bind/public-reverse.tpl +7 -7
- package/templates/var/lib/bind/public.tpl +7 -7
- package/bin/init-private +0 -40
- package/bin/set-jitsi-conf +0 -14
- package/template.js +0 -453
- package/templates/etc/bind/named.conf.private +0 -21
- package/templates/etc/bind/named.conf.public +0 -21
- package/templates/etc/drumee/conf.d/conference.json.tpl +0 -9
- package/templates/etc/drumee/dnsapi.sh.tpl +0 -28
- package/templates/etc/drumee/env.json +0 -29
- package/templates/etc/jitsi/jicofo/sip-cmmunicator.properties +0 -3
- package/templates/etc/nginx/sites-enabled/public.jitsi.conf.tpl +0 -28
- package/templates/etc/prosody/conf.d/vhost.cfg.lua.tpl +0 -162
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
// Jitsi Meet configuration.
|
|
2
|
+
var config = {};
|
|
3
|
+
|
|
4
|
+
if (!config.hasOwnProperty('hosts')) config.hosts = {};
|
|
5
|
+
|
|
6
|
+
config.hosts.domain = '<%= jitsi_private_domain %>';
|
|
7
|
+
config.focusUserJid = 'focus@auth.<%= jitsi_private_domain %>';
|
|
8
|
+
|
|
9
|
+
var subdir = '<!--# echo var="subdir" default="" -->';
|
|
10
|
+
var subdomain = "<!--# echo var="subdomain" default="" -->";
|
|
11
|
+
if (subdir.startsWith('<!--')) {
|
|
12
|
+
subdir = '';
|
|
13
|
+
}
|
|
14
|
+
if (subdomain) {
|
|
15
|
+
subdomain = subdomain.substring(0,subdomain.length-1).split('.').join('_').toLowerCase() + '.';
|
|
16
|
+
}
|
|
17
|
+
config.hosts.muc = 'muc.' + subdomain + '<%= jitsi_private_domain %>';
|
|
18
|
+
config.bosh = '/http-bind';
|
|
19
|
+
|
|
20
|
+
config.websocket = 'wss://<%= jitsi_private_domain %>:<%= public_https_port %>/' + subdir + 'xmpp-websocket';
|
|
21
|
+
|
|
22
|
+
// Video configuration.
|
|
23
|
+
//
|
|
24
|
+
|
|
25
|
+
if (!config.hasOwnProperty('constraints')) config.constraints = {};
|
|
26
|
+
if (!config.constraints.hasOwnProperty('video')) config.constraints.video = {};
|
|
27
|
+
|
|
28
|
+
config.resolution = 720;
|
|
29
|
+
config.constraints.video.height = { ideal: 720, max: 720, min: 180 };
|
|
30
|
+
config.constraints.video.width = { ideal: 1280, max: 1280, min: 320};
|
|
31
|
+
config.disableSimulcast = false;
|
|
32
|
+
config.startVideoMuted = 10;
|
|
33
|
+
config.startWithVideoMuted = false;
|
|
34
|
+
|
|
35
|
+
if (!config.hasOwnProperty('flags')) config.flags = {};
|
|
36
|
+
config.flags.sourceNameSignaling = true;
|
|
37
|
+
config.flags.sendMultipleVideoStreams = true;
|
|
38
|
+
config.flags.receiveMultipleVideoStreams = true;
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
// ScreenShare Configuration.
|
|
42
|
+
//
|
|
43
|
+
|
|
44
|
+
config.desktopSharingFrameRate = { min: 5, max: 5 };
|
|
45
|
+
|
|
46
|
+
// Audio configuration.
|
|
47
|
+
//
|
|
48
|
+
|
|
49
|
+
config.enableNoAudioDetection = true;
|
|
50
|
+
config.enableTalkWhileMuted = false;
|
|
51
|
+
config.disableAP = false;
|
|
52
|
+
|
|
53
|
+
if (!config.hasOwnProperty('audioQuality')) config.audioQuality = {};
|
|
54
|
+
config.audioQuality.stereo = false;
|
|
55
|
+
|
|
56
|
+
config.startAudioOnly = false;
|
|
57
|
+
config.startAudioMuted = 10;
|
|
58
|
+
config.startWithAudioMuted = false;
|
|
59
|
+
config.startSilent = false;
|
|
60
|
+
config.enableOpusRed = false;
|
|
61
|
+
config.disableAudioLevels = false;
|
|
62
|
+
config.enableNoisyMicDetection = true;
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
// Peer-to-Peer options.
|
|
66
|
+
//
|
|
67
|
+
|
|
68
|
+
if (!config.hasOwnProperty('p2p')) config.p2p = {};
|
|
69
|
+
|
|
70
|
+
config.p2p.enabled = true;
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
// Breakout Rooms
|
|
74
|
+
//
|
|
75
|
+
|
|
76
|
+
config.hideAddRoomButton = false;
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
// Etherpad
|
|
80
|
+
//
|
|
81
|
+
|
|
82
|
+
// Recording.
|
|
83
|
+
//
|
|
84
|
+
|
|
85
|
+
// Local recording configuration.
|
|
86
|
+
if (!config.hasOwnProperty('localRecording')) config.localRecording = {};
|
|
87
|
+
config.localRecording.disable = false;
|
|
88
|
+
config.localRecording.notifyAllParticipants = false;
|
|
89
|
+
config.localRecording.disableSelfRecording = false;
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
// Analytics.
|
|
93
|
+
//
|
|
94
|
+
|
|
95
|
+
if (!config.hasOwnProperty('analytics')) config.analytics = {};
|
|
96
|
+
|
|
97
|
+
// Enables callstatsUsername to be reported as statsId and used
|
|
98
|
+
// by callstats as repoted remote id.
|
|
99
|
+
config.enableStatsID = false;
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
// Dial in/out services.
|
|
103
|
+
//
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
// Calendar service integration.
|
|
107
|
+
//
|
|
108
|
+
|
|
109
|
+
config.enableCalendarIntegration = false;
|
|
110
|
+
|
|
111
|
+
// Invitation service.
|
|
112
|
+
//
|
|
113
|
+
|
|
114
|
+
// Miscellaneous.
|
|
115
|
+
//
|
|
116
|
+
|
|
117
|
+
// Prejoin page.
|
|
118
|
+
if (!config.hasOwnProperty('prejoinConfig')) config.prejoinConfig = {};
|
|
119
|
+
config.prejoinConfig.enabled = true;
|
|
120
|
+
|
|
121
|
+
// Hides the participant name editing field in the prejoin screen.
|
|
122
|
+
config.prejoinConfig.hideDisplayName = false;
|
|
123
|
+
|
|
124
|
+
// List of buttons to hide from the extra join options dropdown on prejoin screen.
|
|
125
|
+
// Welcome page.
|
|
126
|
+
config.enableWelcomePage = true;
|
|
127
|
+
|
|
128
|
+
// Close page.
|
|
129
|
+
config.enableClosePage = false;
|
|
130
|
+
|
|
131
|
+
// Default language.
|
|
132
|
+
// Require users to always specify a display name.
|
|
133
|
+
config.requireDisplayName = false;
|
|
134
|
+
|
|
135
|
+
// Chrome extension banner.
|
|
136
|
+
// Disables profile and the edit of all fields from the profile settings (display name and email)
|
|
137
|
+
config.disableProfile = false;
|
|
138
|
+
|
|
139
|
+
// Room password (false for anything, number for max digits)
|
|
140
|
+
config.roomPasswordNumberOfDigits = false;
|
|
141
|
+
// Advanced.
|
|
142
|
+
//
|
|
143
|
+
|
|
144
|
+
// Lipsync hack in jicofo, may not be safe.
|
|
145
|
+
config.enableLipSync = false;
|
|
146
|
+
|
|
147
|
+
config.enableRemb = true;
|
|
148
|
+
config.enableTcc = true;
|
|
149
|
+
|
|
150
|
+
// Enable IPv6 support.
|
|
151
|
+
config.useIPv6 = true;
|
|
152
|
+
|
|
153
|
+
// Transcriptions (subtitles and buttons can be configured in interface_config)
|
|
154
|
+
config.transcription = { enabled: false };
|
|
155
|
+
config.transcription.translationLanguages = [];
|
|
156
|
+
config.transcription.translationLanguagesHead = ['en'];
|
|
157
|
+
config.transcription.useAppLanguage = true;
|
|
158
|
+
config.transcription.preferredLanguage = 'en-US';
|
|
159
|
+
config.transcription.disableStartForAll = false;
|
|
160
|
+
config.transcription.autoCaptionOnRecord = false;
|
|
161
|
+
|
|
162
|
+
// Deployment information.
|
|
163
|
+
//
|
|
164
|
+
|
|
165
|
+
if (!config.hasOwnProperty('deploymentInfo')) config.deploymentInfo = {};
|
|
166
|
+
|
|
167
|
+
// Testing
|
|
168
|
+
//
|
|
169
|
+
|
|
170
|
+
if (!config.hasOwnProperty('testing')) config.testing = {};
|
|
171
|
+
if (!config.testing.hasOwnProperty('octo')) config.testing.octo = {};
|
|
172
|
+
|
|
173
|
+
config.testing.capScreenshareBitrate = 1;
|
|
174
|
+
config.testing.octo.probability = 0;
|
|
175
|
+
|
|
176
|
+
// Deep Linking
|
|
177
|
+
config.disableDeepLinking = false;
|
|
178
|
+
|
|
179
|
+
// P2P preferred codec
|
|
180
|
+
// Enable preferred video Codec
|
|
181
|
+
if (!config.hasOwnProperty('videoQuality')) config.videoQuality = {};
|
|
182
|
+
config.videoQuality.enforcePreferredCodec = false;
|
|
183
|
+
|
|
184
|
+
if (!config.videoQuality.hasOwnProperty('maxBitratesVideo')) config.videoQuality.maxBitratesVideo = null;
|
|
185
|
+
// Reactions
|
|
186
|
+
config.disableReactions = false;
|
|
187
|
+
|
|
188
|
+
// Polls
|
|
189
|
+
config.disablePolls = false;
|
|
190
|
+
|
|
191
|
+
// Configure toolbar buttons
|
|
192
|
+
// Hides the buttons at pre-join screen
|
|
193
|
+
// Configure remote participant video menu
|
|
194
|
+
if (!config.hasOwnProperty('remoteVideoMenu')) config.remoteVideoMenu = {};
|
|
195
|
+
config.remoteVideoMenu.disabled = false;
|
|
196
|
+
config.remoteVideoMenu.disableKick = false;
|
|
197
|
+
config.remoteVideoMenu.disableGrantModerator = false;
|
|
198
|
+
config.remoteVideoMenu.disablePrivateChat = false;
|
|
199
|
+
|
|
200
|
+
// Configure e2eping
|
|
201
|
+
if (!config.hasOwnProperty('e2eping')) config.e2eping = {};
|
|
202
|
+
config.e2eping.enabled = false;
|
|
203
|
+
|
|
204
|
+
|
|
205
|
+
// Settings for the Excalidraw whiteboard integration.
|
|
206
|
+
if (!config.hasOwnProperty('whiteboard')) config.whiteboard = {};
|
|
207
|
+
config.whiteboard.enabled = false;
|
|
208
|
+
config.whiteboard.collabServerBaseUrl = '';
|
|
@@ -3,8 +3,8 @@ var config = {};
|
|
|
3
3
|
|
|
4
4
|
if (!config.hasOwnProperty('hosts')) config.hosts = {};
|
|
5
5
|
|
|
6
|
-
config.hosts.domain = '<%=
|
|
7
|
-
config.focusUserJid = 'focus@auth.<%=
|
|
6
|
+
config.hosts.domain = '<%= jitsi_public_domain %>';
|
|
7
|
+
config.focusUserJid = 'focus@auth.<%= jitsi_public_domain %>';
|
|
8
8
|
|
|
9
9
|
var subdir = '<!--# echo var="subdir" default="" -->';
|
|
10
10
|
var subdomain = "<!--# echo var="subdomain" default="" -->";
|
|
@@ -14,10 +14,10 @@ if (subdir.startsWith('<!--')) {
|
|
|
14
14
|
if (subdomain) {
|
|
15
15
|
subdomain = subdomain.substring(0,subdomain.length-1).split('.').join('_').toLowerCase() + '.';
|
|
16
16
|
}
|
|
17
|
-
config.hosts.muc = 'muc.' + subdomain + '<%=
|
|
17
|
+
config.hosts.muc = 'muc.' + subdomain + '<%= jitsi_public_domain %>';
|
|
18
18
|
config.bosh = '/http-bind';
|
|
19
19
|
|
|
20
|
-
config.websocket = 'wss://<%=
|
|
20
|
+
config.websocket = 'wss://<%= jitsi_public_domain %>:<%= public_https_port %>/' + subdir + 'xmpp-websocket';
|
|
21
21
|
|
|
22
22
|
// Video configuration.
|
|
23
23
|
//
|
|
@@ -14,10 +14,10 @@ server {
|
|
|
14
14
|
|
|
15
15
|
{{ if not (.Env.DISABLE_HTTPS | default "0" | toBool) }}
|
|
16
16
|
server {
|
|
17
|
-
listen
|
|
17
|
+
listen <%= public_https_port %> ssl http2;
|
|
18
18
|
|
|
19
19
|
{{ if .Env.ENABLE_IPV6 | default "1" | toBool }}
|
|
20
|
-
listen [::]
|
|
20
|
+
listen [::]:<%= public_https_port %> ssl http2;
|
|
21
21
|
{{ end }}
|
|
22
22
|
|
|
23
23
|
include /config/nginx/ssl.conf;
|
|
@@ -13,7 +13,7 @@ charset utf8;
|
|
|
13
13
|
|
|
14
14
|
client_max_body_size 0;
|
|
15
15
|
|
|
16
|
-
root
|
|
16
|
+
root <%= jitsi_root_dir %>;
|
|
17
17
|
|
|
18
18
|
# ssi on with javascript for multidomain variables in config.js
|
|
19
19
|
ssi on;
|
|
@@ -44,7 +44,7 @@ location = /interface_config.js {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
location = /external_api.js {
|
|
47
|
-
alias
|
|
47
|
+
alias <%= jitsi_root_dir %>/libs/external_api.min.js;
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
{{ if $ENABLE_JAAS_COMPONENTS }}
|
|
@@ -59,7 +59,7 @@ location = /_api/room-info {
|
|
|
59
59
|
# ensure all static content can always be found first
|
|
60
60
|
location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ {
|
|
61
61
|
add_header 'Access-Control-Allow-Origin' '*';
|
|
62
|
-
alias
|
|
62
|
+
alias <%= jitsi_root_dir %>/$1/$2;
|
|
63
63
|
|
|
64
64
|
# cache all versioned files
|
|
65
65
|
if ($arg_v) {
|
|
@@ -52,7 +52,7 @@ bind-address = 127.0.0.1
|
|
|
52
52
|
# Both location gets rotated by the cronjob.
|
|
53
53
|
# Be aware that this log type is a performance killer.
|
|
54
54
|
# Recommend only changing this at runtime for short testing periods if needed!
|
|
55
|
-
#general_log_file =
|
|
55
|
+
#general_log_file = <%= db_dir %>/log/mysql.log
|
|
56
56
|
#general_log = 1
|
|
57
57
|
|
|
58
58
|
# When running under systemd, error logging goes via stdout/stderr to journald
|
|
@@ -60,6 +60,7 @@ bind-address = 127.0.0.1
|
|
|
60
60
|
# /etc/mysql/conf.d/mariadb.conf.d/50-mysqld_safe.cnf
|
|
61
61
|
# Enable this if you want to have error logging into a separate file
|
|
62
62
|
log_error = /var/log/mysql/error.log
|
|
63
|
+
|
|
63
64
|
# Enable the slow query log to see queries with especially long duration
|
|
64
65
|
#log_slow_query_file = /var/log/mysql/mariadb-slow.log
|
|
65
66
|
#log_slow_query_time = 10
|
|
@@ -71,7 +72,7 @@ log_error = /var/log/mysql/error.log
|
|
|
71
72
|
# note: if you are setting up a replication slave, see README.Debian about
|
|
72
73
|
# other settings you may need to change.
|
|
73
74
|
#server-id = 1
|
|
74
|
-
#log_bin =
|
|
75
|
+
#log_bin = <%= db_dir %>/log/mysql-bin.log
|
|
75
76
|
expire_logs_days = 10
|
|
76
77
|
#max_binlog_size = 100M
|
|
77
78
|
|
|
@@ -92,7 +93,6 @@ expire_logs_days = 10
|
|
|
92
93
|
|
|
93
94
|
# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
|
|
94
95
|
# utf8 4-byte character set. See also client.cnf
|
|
95
|
-
character-set-client-handshake = FALSE
|
|
96
96
|
character-set-server = utf8mb4
|
|
97
97
|
collation-server = utf8mb4_general_ci
|
|
98
98
|
|
package/templates/etc/nginx/modules-enabled/{90-turn-relay.conf → 90-turn-relay.private.conf.tpl}
RENAMED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
stream {
|
|
2
2
|
map $ssl_preread_server_name $name {
|
|
3
|
-
|
|
4
|
-
turn-jitsi.<%=
|
|
3
|
+
turn.<%= jitsi_private_domain %> web_backend;
|
|
4
|
+
turn-jitsi.<%= jitsi_private_domain %> turn_backend;
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
upstream web_backend {
|
|
8
|
-
server 127.0.0.1:
|
|
8
|
+
server 127.0.0.1:3478;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
upstream turn_backend {
|
|
12
|
-
server <%=
|
|
12
|
+
server <%= private_ip4 %>:5349;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
server {
|
|
16
|
-
listen
|
|
17
|
-
listen [::]
|
|
16
|
+
listen <%= public_https_port %> udp;
|
|
17
|
+
listen [::]:<%= public_https_port %> udp;
|
|
18
18
|
|
|
19
19
|
# since 1.11.5
|
|
20
20
|
ssl_preread on;
|
package/templates/etc/nginx/modules-enabled/{90-turn-relay.conf.tpl → 90-turn-relay.public.conf.tpl}
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
stream {
|
|
2
2
|
map $ssl_preread_server_name $name {
|
|
3
|
-
turn.<%=
|
|
4
|
-
turn-jitsi.<%=
|
|
3
|
+
turn.<%= jitsi_public_domain %> web_backend;
|
|
4
|
+
turn-jitsi.<%= jitsi_public_domain %> turn_backend;
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
upstream web_backend {
|
|
@@ -13,8 +13,8 @@ stream {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
server {
|
|
16
|
-
listen
|
|
17
|
-
listen [::]
|
|
16
|
+
listen <%= public_https_port %> udp;
|
|
17
|
+
listen [::]:<%= public_https_port %> udp;
|
|
18
18
|
|
|
19
19
|
# since 1.11.5
|
|
20
20
|
ssl_preread on;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
user
|
|
2
|
+
user www-data;
|
|
3
3
|
worker_processes 4;
|
|
4
4
|
pid /run/nginx.pid;
|
|
5
5
|
include /etc/nginx/modules-enabled/*.conf;
|
|
@@ -59,6 +59,8 @@ http {
|
|
|
59
59
|
# Virtual Host Configs
|
|
60
60
|
##
|
|
61
61
|
include /etc/nginx/sites-enabled/*.conf;
|
|
62
|
+
|
|
63
|
+
disable_symlinks <%= disable_symlinks %>;
|
|
62
64
|
}
|
|
63
65
|
|
|
64
66
|
|
|
@@ -10,16 +10,16 @@
|
|
|
10
10
|
|
|
11
11
|
proxy_cache_path <%= cache_dir %>/<%= public_domain %> levels=1:2 keys_zone=<%= public_domain %>_keys_zone:10m max_size=10g inactive=60m;
|
|
12
12
|
server {
|
|
13
|
-
listen <%=
|
|
14
|
-
listen [::]:<%=
|
|
13
|
+
listen <%= public_http_port %>;
|
|
14
|
+
listen [::]:<%= public_http_port %>;
|
|
15
15
|
server_name <%= public_domain %>;
|
|
16
16
|
location / {
|
|
17
17
|
return 301 https://$host$request_uri;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
server {
|
|
21
|
-
listen <%=
|
|
22
|
-
listen [::]:<%=
|
|
21
|
+
listen <%= public_https_port %> ssl;
|
|
22
|
+
listen [::]:<%= public_https_port %> ssl;
|
|
23
23
|
#
|
|
24
24
|
root <%= server_dir %>;
|
|
25
25
|
server_name <%= public_domain %>;
|
|
@@ -31,10 +31,10 @@ server {
|
|
|
31
31
|
|
|
32
32
|
set $prefix "";
|
|
33
33
|
|
|
34
|
-
include /etc/drumee/ssl/
|
|
34
|
+
include /etc/drumee/ssl/public.conf;
|
|
35
35
|
include /etc/drumee/infrastructure/routes/*.conf;
|
|
36
|
-
include /etc/drumee/infrastructure/internals
|
|
37
|
-
include /etc/drumee/infrastructure/mfs.conf;
|
|
36
|
+
include /etc/drumee/infrastructure/internals/accel.public.conf;
|
|
37
|
+
include /etc/drumee/infrastructure/mfs.public.conf;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
|
|
@@ -10,16 +10,16 @@
|
|
|
10
10
|
|
|
11
11
|
proxy_cache_path <%= cache_dir %>/<%= private_domain %> levels=1:2 keys_zone=<%= private_domain %>_keys_zone:10m max_size=10g inactive=60m;
|
|
12
12
|
server {
|
|
13
|
-
listen <%=
|
|
14
|
-
listen [::]:<%=
|
|
13
|
+
listen <%= public_http_port %>;
|
|
14
|
+
listen [::]:<%= public_http_port %>;
|
|
15
15
|
server_name <%= private_domain %>;
|
|
16
16
|
location / {
|
|
17
17
|
return 301 https://$host$request_uri;
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
server {
|
|
21
|
-
listen <%=
|
|
22
|
-
listen [::]:<%=
|
|
21
|
+
listen <%= public_https_port %> ssl;
|
|
22
|
+
listen [::]:<%= public_https_port %> ssl;
|
|
23
23
|
#
|
|
24
24
|
root <%= server_dir %>;
|
|
25
25
|
server_name <%= private_domain %>;
|
|
@@ -33,8 +33,8 @@ server {
|
|
|
33
33
|
|
|
34
34
|
include /etc/drumee/ssl/private.conf;
|
|
35
35
|
include /etc/drumee/infrastructure/routes/*.conf;
|
|
36
|
-
include /etc/drumee/infrastructure/internals
|
|
37
|
-
include /etc/drumee/infrastructure/mfs.conf;
|
|
36
|
+
include /etc/drumee/infrastructure/internals/accel.private.conf;
|
|
37
|
+
include /etc/drumee/infrastructure/mfs.private.conf;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
|
|
@@ -12,17 +12,17 @@ map $http_upgrade $connection_upgrade {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
server {
|
|
15
|
-
listen <%=
|
|
16
|
-
listen [::]:<%=
|
|
17
|
-
server_name *.<%=
|
|
18
|
-
include /etc/jitsi/meet.conf;
|
|
15
|
+
listen <%= public_http_port %> default_server;
|
|
16
|
+
listen [::]:<%= public_http_port %> default_server;
|
|
17
|
+
server_name *.<%= jitsi_private_domain %>;
|
|
18
|
+
include /etc/jitsi/meet.private.conf;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
server {
|
|
22
|
-
listen <%=
|
|
23
|
-
listen [::]:<%=
|
|
24
|
-
server_name <%=
|
|
25
|
-
include /etc/jitsi/ssl.conf;
|
|
26
|
-
include /etc/jitsi/meet.conf;
|
|
22
|
+
listen <%= public_https_port %> ssl http2;
|
|
23
|
+
listen [::]:<%= public_https_port %> ssl http2;
|
|
24
|
+
server_name <%= jitsi_private_domain %>;
|
|
25
|
+
include /etc/jitsi/ssl.private.conf;
|
|
26
|
+
include /etc/jitsi/meet.private.conf;
|
|
27
27
|
}
|
|
28
28
|
|
package/templates/etc/nginx/sites-enabled/{pivate.jitsi.conf.tpl → 20-jitsi.public.conf.tpl}
RENAMED
|
@@ -12,17 +12,17 @@ map $http_upgrade $connection_upgrade {
|
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
server {
|
|
15
|
-
listen <%=
|
|
16
|
-
listen [::]:<%=
|
|
17
|
-
server_name *.<%=
|
|
18
|
-
include /etc/jitsi/meet.conf;
|
|
15
|
+
listen <%= public_http_port %> default_server;
|
|
16
|
+
listen [::]:<%= public_http_port %> default_server;
|
|
17
|
+
server_name *.<%= jitsi_public_domain %>;
|
|
18
|
+
include /etc/jitsi/meet.public.conf;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
server {
|
|
22
|
-
listen <%=
|
|
23
|
-
listen [::]:<%=
|
|
24
|
-
server_name <%=
|
|
25
|
-
include /etc/jitsi/ssl.conf;
|
|
26
|
-
include /etc/jitsi/meet.conf;
|
|
22
|
+
listen <%= public_https_port %> ssl http2;
|
|
23
|
+
listen [::]:<%= public_https_port %> ssl http2;
|
|
24
|
+
server_name <%= jitsi_public_domain %>;
|
|
25
|
+
include /etc/jitsi/ssl.public.conf;
|
|
26
|
+
include /etc/jitsi/meet.public.conf;
|
|
27
27
|
}
|
|
28
28
|
|
|
@@ -3,18 +3,19 @@
|
|
|
3
3
|
# !!!!!!! DO NOT EDIT !!!!!!!!
|
|
4
4
|
# Config file automatically generated by <setup-infra>
|
|
5
5
|
# Purpose : Provide Nginx config to a specific server
|
|
6
|
-
# Server name :
|
|
6
|
+
# Server name : loopback
|
|
7
7
|
# Date : <%= date %>
|
|
8
8
|
# -------------------------------------------------------------
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
|
|
11
|
+
proxy_cache_path <%= cache_dir %>/loopback levels=1:2 keys_zone=loopback_keys_zone:10m max_size=10g inactive=60m;
|
|
11
12
|
server {
|
|
12
|
-
listen
|
|
13
|
-
|
|
14
|
-
server_name localhost;
|
|
13
|
+
listen 127.0.0.1:<%= public_http_port %>;
|
|
14
|
+
server_name _;
|
|
15
15
|
#
|
|
16
|
-
root <%=
|
|
17
|
-
|
|
16
|
+
root <%= server_dir %>;
|
|
17
|
+
server_name _;
|
|
18
|
+
client_max_body_size <%= max_body_size %>;
|
|
18
19
|
|
|
19
20
|
# Security headers
|
|
20
21
|
add_header X-Content-Type-Options nosniff;
|
|
@@ -22,10 +23,10 @@ server {
|
|
|
22
23
|
|
|
23
24
|
set $prefix "";
|
|
24
25
|
|
|
26
|
+
include /etc/drumee/ssl/main.conf;
|
|
25
27
|
include /etc/drumee/infrastructure/routes/*.conf;
|
|
26
|
-
include /etc/drumee/infrastructure/internals
|
|
28
|
+
include /etc/drumee/infrastructure/internals/*.conf;
|
|
27
29
|
include /etc/drumee/infrastructure/mfs.conf;
|
|
28
30
|
}
|
|
29
31
|
|
|
30
32
|
|
|
31
|
-
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
server {
|
|
2
2
|
listen 4444 ssl;
|
|
3
3
|
listen [::]:4444 ssl;
|
|
4
|
-
server_name turn.<%=
|
|
5
|
-
ssl_certificate_key <%= certs_dir %>/<%=
|
|
6
|
-
ssl_certificate <%= certs_dir %>/<%=
|
|
7
|
-
ssl_trusted_certificate <%= certs_dir %>/<%=
|
|
4
|
+
server_name turn.<%= jitsi_public_domain %>;
|
|
5
|
+
ssl_certificate_key <%= certs_dir %>/<%= jitsi_public_domain %>_ecc/<%= jitsi_public_domain %>.key;
|
|
6
|
+
ssl_certificate <%= certs_dir %>/<%= jitsi_public_domain %>_ecc/fullchain.cer;
|
|
7
|
+
ssl_trusted_certificate <%= certs_dir %>/<%= jitsi_public_domain %>_ecc/ca.cer;
|
|
8
8
|
}
|
|
9
9
|
|