@drumee/setup-infra 1.0.24 → 1.0.26

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.
Files changed (5) hide show
  1. package/index.js +6 -1
  2. package/package.json +1 -1
  3. package/templates/etc/drumee/drumee.sh.tpl +2 -1
  4. package/templates/etc/drumee/infrastructure/routes/private.conf.tpl +13 -9
  5. package/templates/etc/drumee/infrastructure/routes/public.conf.tpl +16 -11
package/index.js CHANGED
@@ -26,8 +26,8 @@ let {
26
26
  DRUMEE_DESCRIPTION,
27
27
  DRUMEE_DOMAIN_NAME,
28
28
  DRUMEE_HTTP_PORT,
29
- DRUMEE_LOCAL_PORT,
30
29
  DRUMEE_HTTPS_PORT,
30
+ DRUMEE_LOCAL_PORT,
31
31
  MAIL_USER,
32
32
  MAX_BODY_SIZE,
33
33
  NSUPDATE_KEY,
@@ -36,6 +36,7 @@ let {
36
36
  PRIVATE_IP4,
37
37
  PRIVATE_IP6,
38
38
  PUBLIC_IP4,
39
+ USE_JITSI,
39
40
  PRIVATE_IF4,
40
41
  PUBLIC_IP6,
41
42
  STORAGE_BACKUP,
@@ -352,6 +353,7 @@ function getSysConfigs() {
352
353
  ["db_dir", DRUMEE_DB_DIR, '/srv/db'],
353
354
  ["domain_desc", DRUMEE_DESCRIPTION, 'My Drumee Box'],
354
355
  ["jitsi_root_dir", '/usr/share/jitsi-meet'],
356
+ ["use_jitsi", USE_JITSI],
355
357
  ["max_body_size", MAX_BODY_SIZE, '10G'],
356
358
  ["nsupdate_key", NSUPDATE_KEY, nsupdate_key],
357
359
  ["private_domain", PRIVATE_DOMAIN],
@@ -365,6 +367,9 @@ function getSysConfigs() {
365
367
  ["storage_backup", backup_storage], /** Legacy */
366
368
  ]
367
369
  let data = makeData(opt);
370
+ if (args.only_infra || args.no_jitsi || !data.use_jitsi) {
371
+ data.use_jitsi = "no";
372
+ }
368
373
  if (!data) {
369
374
  exit(1);
370
375
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@drumee/setup-infra",
3
- "version": "1.0.24",
3
+ "version": "1.0.26",
4
4
  "description": "Drumee Infrastructure Setup Utilities",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/templates/etc/drumee/drumee.sh.tpl CHANGED
@@ -63,4 +63,5 @@ export DRUMEE_DB_BACKUP=<%= backup_storage %>/db
63
63
  export PUBLIC_UI_ROOT=<%= public_ui_root %>
64
64
  export PUBLIC_HTTP_PORT=<%= public_http_port %>
65
65
  export PUBLIC_HTTPS_PORT=<%= public_https_port %>
66
- export ACME_ENV_FILE=<%= acme_env_file %>
66
+ export ACME_ENV_FILE=<%= acme_env_file %>
67
+ export USE_JITSI=<%= use_jitsi %>
package/templates/etc/drumee/infrastructure/routes/private.conf.tpl CHANGED
@@ -51,11 +51,12 @@ location <%= location %> {
51
51
  proxy_http_version 1.1;
52
52
  proxy_set_header Upgrade $http_upgrade;
53
53
  proxy_set_header Connection 'upgrade';
54
+ proxy_set_header Host $host;
55
+ proxy_set_header X-Real-IP $remote_addr;
56
+ proxy_set_header X-Connecting-IP $remote_addr;
54
57
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
55
58
  proxy_set_header X-Forwarded-Proto $scheme;
56
- proxy_set_header X-Real-IP $remote_addr;
57
- proxy_set_header X-Connecting-IP $remote_addr;
58
- proxy_set_header Host $host;
59
+ proxy_set_header X-Forwarded-Port $server_port;
59
60
  add_header Vary "Accept-Encoding";
60
61
  fastcgi_hide_header Set-Cookie;
61
62
  break;
@@ -66,11 +67,12 @@ location <%= location %> {
66
67
  proxy_http_version 1.1;
67
68
  proxy_set_header Upgrade $http_upgrade;
68
69
  proxy_set_header Connection 'upgrade';
70
+ proxy_set_header Host $host;
71
+ proxy_set_header X-Real-IP $remote_addr;
72
+ proxy_set_header X-Connecting-IP $remote_addr;
69
73
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
70
74
  proxy_set_header X-Forwarded-Proto $scheme;
71
- proxy_set_header X-Real-IP $remote_addr;
72
- proxy_set_header X-Connecting-IP $remote_addr;
73
- proxy_set_header Host $host;
75
+ proxy_set_header X-Forwarded-Port $server_port;
74
76
  add_header Vary "Accept-Encoding";
75
77
  fastcgi_hide_header Set-Cookie;
76
78
  break;
@@ -132,10 +134,12 @@ location <%= location %> {
132
134
  proxy_http_version 1.1;
133
135
  proxy_set_header Upgrade $http_upgrade;
134
136
  proxy_set_header Connection 'upgrade';
135
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
136
- proxy_set_header X-Real-IP $remote_addr;
137
+ proxy_set_header Host $host;
138
+ proxy_set_header X-Real-IP $remote_addr;
137
139
  proxy_set_header X-Connecting-IP $remote_addr;
138
- proxy_set_header Host $host;
140
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
141
+ proxy_set_header X-Forwarded-Proto $scheme;
142
+ proxy_set_header X-Forwarded-Port $server_port;
139
143
  proxy_set_header Referer $http_referer;
140
144
  add_header Access-Control-Allow-Credentials true;
141
145
  add_header Vary "Accept-Encoding";
package/templates/etc/drumee/infrastructure/routes/public.conf.tpl CHANGED
@@ -51,11 +51,13 @@ location <%= location %> {
51
51
  proxy_http_version 1.1;
52
52
  proxy_set_header Upgrade $http_upgrade;
53
53
  proxy_set_header Connection 'upgrade';
54
+ proxy_set_header Host $host;
55
+ proxy_set_header X-Real-IP $remote_addr;
56
+ proxy_set_header X-Connecting-IP $remote_addr;
54
57
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
55
58
  proxy_set_header X-Forwarded-Proto $scheme;
56
- proxy_set_header X-Real-IP $remote_addr;
57
- proxy_set_header X-Connecting-IP $remote_addr;
58
- proxy_set_header Host $host;
59
+ proxy_set_header X-Forwarded-Port $server_port;
60
+ proxy_set_header Referer $http_referer;
59
61
  add_header Vary "Accept-Encoding";
60
62
  fastcgi_hide_header Set-Cookie;
61
63
  break;
@@ -66,11 +68,13 @@ location <%= location %> {
66
68
  proxy_http_version 1.1;
67
69
  proxy_set_header Upgrade $http_upgrade;
68
70
  proxy_set_header Connection 'upgrade';
71
+ proxy_set_header Host $host;
72
+ proxy_set_header X-Real-IP $remote_addr;
73
+ proxy_set_header X-Connecting-IP $remote_addr;
69
74
  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
70
75
  proxy_set_header X-Forwarded-Proto $scheme;
71
- proxy_set_header X-Real-IP $remote_addr;
72
- proxy_set_header X-Connecting-IP $remote_addr;
73
- proxy_set_header Host $host;
76
+ proxy_set_header X-Forwarded-Port $server_port;
77
+ proxy_set_header Referer $http_referer;
74
78
  add_header Vary "Accept-Encoding";
75
79
  fastcgi_hide_header Set-Cookie;
76
80
  break;
@@ -125,18 +129,19 @@ location <%= location %> {
125
129
  break;
126
130
  }
127
131
 
128
-
129
132
  #------------ parts/index ------------
130
133
  location ~ (/|)$ {
131
134
  proxy_pass http://127.0.0.1:<%= pushPort %>;
132
135
  proxy_http_version 1.1;
133
136
  proxy_set_header Upgrade $http_upgrade;
134
137
  proxy_set_header Connection 'upgrade';
135
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
136
- proxy_set_header X-Real-IP $remote_addr;
138
+ proxy_set_header Host $host;
139
+ proxy_set_header X-Real-IP $remote_addr;
137
140
  proxy_set_header X-Connecting-IP $remote_addr;
138
- proxy_set_header Host $host;
139
- proxy_set_header Referer $http_referer;
141
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
142
+ proxy_set_header X-Forwarded-Proto $scheme;
143
+ proxy_set_header X-Forwarded-Port $server_port;
144
+ proxy_set_header Referer $http_referer;
140
145
  add_header Access-Control-Allow-Credentials true;
141
146
  add_header Vary "Accept-Encoding";
142
147
  fastcgi_hide_header Set-Cookie;