Skip to content

Commit 77cda20

Browse files
Zoey2936Zoey2936
committed
add grpc usptream support/dep updates/merge upstream
Signed-off-by: Zoey <[email protected]>
1 parent c1f888c commit 77cda20

File tree

23 files changed

+176
-322
lines changed

23 files changed

+176
-322
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ so that the barrier for entry here is low.
7474
- fixed smaller issues/bugs
7575
- other small changes/improvements
7676

77-
## migration (currently not working when migrating from upstream 2.12.3)
77+
## migration
7878
- **NOTE: migrating back to the original is not possible**, so make first a **backup** before migration, so you can use the backup to switch back
7979
- please delete all certs using dnspod as dns provider and recreate them after migration, since the certbot plugin used was replaced
8080
- stop nginx-proxy-manager download the latest compose.yaml, adjust your paths (of /etc/letsencrypt and /data) to the ones you used with nginx-proxy-manager and adjust the envs of the compose file how you like it and then deploy it

‎backend/migrations/20240427161436_stream_ssl.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const migrate_name = 'stream_ssl';
2-
const logger = require('../logger').migrate;
2+
const logger = require('../logger').migrate;
33

44
/**
55
* Migrate
@@ -12,9 +12,10 @@ const logger = require('../logger').migrate;
1212
exports.up = function (knex) {
1313
logger.info('[' + migrate_name + '] Migrating Up...');
1414

15-
return knex.schema.table('stream', (table) => {
16-
table.integer('certificate_id').notNull().unsigned().defaultTo(0);
17-
})
15+
return knex.schema
16+
.table('stream', (table) => {
17+
table.integer('certificate_id').notNull().unsigned().defaultTo(0);
18+
})
1819
.then(function () {
1920
logger.info('[' + migrate_name + '] stream Table altered');
2021
});
@@ -29,9 +30,10 @@ exports.up = function (knex) {
2930
exports.down = function (knex) {
3031
logger.info('[' + migrate_name + '] Migrating Down...');
3132

32-
return knex.schema.table('stream', (table) => {
33-
table.dropColumn('certificate_id');
34-
})
33+
return knex.schema
34+
.table('stream', (table) => {
35+
table.dropColumn('certificate_id');
36+
})
3537
.then(function () {
3638
logger.info('[' + migrate_name + '] stream Table altered');
3739
});

‎backend/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"batchflow": "0.4.0",
1212
"bcrypt": "5.1.1",
1313
"better-sqlite3": "11.8.1",
14-
"body-parser": "2.0.2",
15-
"compression": "1.7.5",
14+
"body-parser": "2.1.0",
15+
"compression": "1.8.0",
1616
"express": "4.21.2",
1717
"express-fileupload": "1.5.1",
1818
"gravatar": "1.8.2",
@@ -25,15 +25,15 @@
2525
"node-rsa": "1.1.1",
2626
"objection": "3.1.5",
2727
"path": "0.12.7",
28-
"pg": "8.13.1",
28+
"pg": "8.13.2",
2929
"signale": "1.4.0"
3030
},
3131
"author": "Jamie Curnow <[email protected]> and ZoeyVid <[email protected]>",
3232
"license": "MIT",
3333
"devDependencies": {
3434
"@apidevtools/swagger-parser": "10.1.1",
3535
"@eslint/js": "9.20.0",
36-
"eslint": "9.20.0",
36+
"eslint": "9.20.1",
3737
"eslint-config-prettier": "10.0.1",
3838
"eslint-plugin-prettier": "5.2.3",
3939
"globals": "15.14.0",

‎backend/schema/components/proxy-host-object.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
},
8282
"forward_scheme": {
8383
"type": "string",
84-
"enum": ["http", "https"]
84+
"enum": ["http", "https", "grpc", "grpcs"]
8585
},
8686
"enabled": {
8787
"$ref": "../common.json#/properties/enabled"

‎backend/templates/_certificates_stream.conf

-13
This file was deleted.

‎backend/templates/_location.conf

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
{% assign path_first_char = path | slice: 0 -%}
2+
{% assign path_last_char = path | slice: -1 -%}
3+
4+
{% if path != "/" and path_first_char == "/" and path_last_char == "/" %}
5+
location {{ path | remove_last: "/" }} {
6+
absolute_redirect off;
7+
return 301 {{ path }}/;
8+
}
9+
{% endif %}
10+
111
location {{ path }} {
212
set $forward_scheme "{{ forward_scheme }}";
313
set $server "{{ forward_host }}";

‎backend/templates/proxy_host.conf

+6-1
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,14 @@ server {
4343
proxy_set_header Upgrade $http_upgrade;
4444
proxy_set_header Connection $connection_upgrade;
4545
{% endif %}
46-
46+
47+
{% if forward_scheme == "grpc" or forward_scheme == "grpcs" %}
48+
include conf.d/include/grpc-headers.conf;
49+
grpc_pass {{ forward_scheme }}://{{ forward_host }}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
50+
{% else %}
4751
include conf.d/include/proxy-headers.conf;
4852
proxy_pass {{ forward_scheme }}://{{ forward_host }}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
53+
{% endif %}
4954
}
5055
{% endif %}
5156

‎backend/yarn.lock

+77-57
Original file line numberDiff line numberDiff line change
@@ -440,21 +440,20 @@ [email protected]:
440440
type-is "~1.6.18"
441441
unpipe "1.0.0"
442442

443-
[email protected]:
444-
version "2.0.2"
445-
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.0.2.tgz#52a90ca70bfafae03210b5b998e4ffcc3ecaecae"
446-
integrity sha512-SNMk0OONlQ01uk8EPeiBvTW7W4ovpL5b1O3t1sjpPgfxOQ6BqQJ6XjxinDPR79Z6HdcD5zBBwr5ssiTlgdNztQ==
447-
dependencies:
448-
bytes "3.1.2"
449-
content-type "~1.0.5"
450-
debug "3.1.0"
451-
destroy "1.2.0"
452-
http-errors "2.0.0"
453-
iconv-lite "0.5.2"
454-
on-finished "2.4.1"
455-
qs "6.13.0"
443+
[email protected]:
444+
version "2.1.0"
445+
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.1.0.tgz#2fd84396259e00fa75648835e2d95703bce8e890"
446+
integrity sha512-/hPxh61E+ll0Ujp24Ilm64cykicul1ypfwjVttduAiEdtnJFvLePSrIPk+HMImtNv5270wOGCb1Tns2rybMkoQ==
447+
dependencies:
448+
bytes "^3.1.2"
449+
content-type "^1.0.5"
450+
debug "^4.4.0"
451+
http-errors "^2.0.0"
452+
iconv-lite "^0.5.2"
453+
on-finished "^2.4.1"
454+
qs "^6.14.0"
456455
raw-body "^3.0.0"
457-
type-is "~1.6.18"
456+
type-is "^2.0.0"
458457

459458
brace-expansion@^1.1.7:
460459
version "1.1.11"
@@ -504,7 +503,7 @@ busboy@^1.6.0:
504503
dependencies:
505504
streamsearch "^1.1.0"
506505

507-
[email protected]:
506+
[email protected], bytes@^3.1.2:
508507
version "3.1.2"
509508
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
510509
integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
@@ -633,10 +632,10 @@ compressible@~2.0.18:
633632
dependencies:
634633
mime-db ">= 1.43.0 < 2"
635634

636-
compression@1.7.5:
637-
version "1.7.5"
638-
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.5.tgz#fdd256c0a642e39e314c478f6c2cd654edd74c93"
639-
integrity sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==
635+
compression@1.8.0:
636+
version "1.8.0"
637+
resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.0.tgz#09420efc96e11a0f44f3a558de59e321364180f7"
638+
integrity sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==
640639
dependencies:
641640
bytes "3.1.2"
642641
compressible "~2.0.18"
@@ -663,7 +662,7 @@ [email protected]:
663662
dependencies:
664663
safe-buffer "5.2.1"
665664

666-
content-type@~1.0.4, content-type@~1.0.5:
665+
content-type@^1.0.5, content-type@~1.0.4, content-type@~1.0.5:
667666
version "1.0.5"
668667
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
669668
integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -717,14 +716,7 @@ [email protected]:
717716
dependencies:
718717
ms "2.0.0"
719718

720-
[email protected]:
721-
version "3.1.0"
722-
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
723-
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
724-
dependencies:
725-
ms "2.0.0"
726-
727-
debug@4, debug@^4.3.1, debug@^4.3.2:
719+
debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.4.0:
728720
version "4.4.0"
729721
resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
730722
integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
@@ -918,10 +910,10 @@ eslint-visitor-keys@^4.2.0:
918910
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
919911
integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
920912

921-
[email protected].0:
922-
version "9.20.0"
923-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.0.tgz#6244c46c1640cd5e577a31ebc460fca87838c0b7"
924-
integrity sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA==
913+
[email protected].1:
914+
version "9.20.1"
915+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.1.tgz#923924c078f5226832449bac86662dd7e53c91d6"
916+
integrity sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==
925917
dependencies:
926918
"@eslint-community/eslint-utils" "^4.2.0"
927919
"@eslint-community/regexpp" "^4.12.1"
@@ -1352,7 +1344,7 @@ hasown@^2.0.2:
13521344
dependencies:
13531345
function-bind "^1.1.2"
13541346

1355-
[email protected]:
1347+
[email protected], http-errors@^2.0.0:
13561348
version "2.0.0"
13571349
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
13581350
integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
@@ -1378,20 +1370,20 @@ [email protected]:
13781370
dependencies:
13791371
safer-buffer ">= 2.1.2 < 3"
13801372

1381-
[email protected]:
1382-
version "0.5.2"
1383-
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8"
1384-
integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==
1385-
dependencies:
1386-
safer-buffer ">= 2.1.2 < 3"
1387-
13881373
[email protected], iconv-lite@^0.6.3:
13891374
version "0.6.3"
13901375
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
13911376
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
13921377
dependencies:
13931378
safer-buffer ">= 2.1.2 < 3.0.0"
13941379

1380+
iconv-lite@^0.5.2:
1381+
version "0.5.2"
1382+
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8"
1383+
integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==
1384+
dependencies:
1385+
safer-buffer ">= 2.1.2 < 3"
1386+
13951387
ieee754@^1.1.13, ieee754@^1.2.1:
13961388
version "1.2.1"
13971389
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -1734,6 +1726,11 @@ [email protected]:
17341726
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
17351727
integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
17361728

1729+
media-typer@^1.1.0:
1730+
version "1.1.0"
1731+
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-1.1.0.tgz#6ab74b8f2d3320f2064b2a87a38e7931ff3a5561"
1732+
integrity sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==
1733+
17371734
[email protected]:
17381735
version "1.0.3"
17391736
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
@@ -1749,11 +1746,18 @@ [email protected]:
17491746
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
17501747
integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
17511748

1752-
"mime-db@>= 1.43.0 < 2":
1749+
"mime-db@>= 1.43.0 < 2", mime-db@^1.53.0:
17531750
version "1.53.0"
17541751
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
17551752
integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
17561753

1754+
mime-types@^3.0.0:
1755+
version "3.0.0"
1756+
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.0.tgz#148453a900475522d095a445355c074cca4f5217"
1757+
integrity sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w==
1758+
dependencies:
1759+
mime-db "^1.53.0"
1760+
17571761
mime-types@~2.1.24, mime-types@~2.1.34:
17581762
version "2.1.35"
17591763
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
@@ -1961,7 +1965,7 @@ [email protected]:
19611965
ajv-formats "^2.1.1"
19621966
db-errors "^0.2.3"
19631967

1964-
[email protected]:
1968+
[email protected], on-finished@^2.4.1:
19651969
version "2.4.1"
19661970
resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
19671971
integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -2135,15 +2139,15 @@ [email protected]:
21352139
resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
21362140
integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
21372141

2138-
pg-pool@^3.7.0:
2139-
version "3.7.0"
2140-
resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.7.0.tgz#d4d3c7ad640f8c6a2245adc369bafde4ebb8cbec"
2141-
integrity sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==
2142+
pg-pool@^3.7.1:
2143+
version "3.7.1"
2144+
resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.7.1.tgz#d1aaf618618d8f878acf185e86084928b8cd5b3c"
2145+
integrity sha512-xIOsFoh7Vdhojas6q3596mXFsR8nwBQBXX5JiV7p9buEVAGqYL4yFzclON5P9vFrpu1u7Zwl2oriyDa89n0wbw==
21422146

2143-
pg-protocol@^1.7.0:
2144-
version "1.7.0"
2145-
resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.7.0.tgz#ec037c87c20515372692edac8b63cf4405448a93"
2146-
integrity sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==
2147+
pg-protocol@^1.7.1:
2148+
version "1.7.1"
2149+
resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.7.1.tgz#aad61a6f927b51e89dcf721408b76c0e536d43dc"
2150+
integrity sha512-gjTHWGYWsEgy9MsY0Gp6ZJxV24IjDqdpTW7Eh0x+WfJLFsm/TJx1MzL6T0D88mBvkpxotCQ6TwW6N+Kko7lhgQ==
21472151

21482152
pg-types@^2.1.0:
21492153
version "2.2.0"
@@ -2156,14 +2160,14 @@ pg-types@^2.1.0:
21562160
postgres-date "~1.0.4"
21572161
postgres-interval "^1.1.0"
21582162

2159-
[email protected].1:
2160-
version "8.13.1"
2161-
resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.1.tgz#6498d8b0a87ff76c2df7a32160309d3168c0c080"
2162-
integrity sha512-OUir1A0rPNZlX//c7ksiu7crsGZTKSOXJPgtNiHGIlC9H0lO+NC6ZDYksSgBYY/thSWhnSRBv8w1lieNNGATNQ==
2163+
[email protected].2:
2164+
version "8.13.2"
2165+
resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.2.tgz#1839ce186f10cd95a77932f04d36f08e37c67827"
2166+
integrity sha512-L5QkPvTjVWWHbLaFjCkOSplpb2uCiRYbg0IJ2okCy5ClYfWlSgDDnvdR6dyw3EWAH2AfS4j8E61QFI7gLfTtlw==
21632167
dependencies:
21642168
pg-connection-string "^2.7.0"
2165-
pg-pool "^3.7.0"
2166-
pg-protocol "^1.7.0"
2169+
pg-pool "^3.7.1"
2170+
pg-protocol "^1.7.1"
21672171
pg-types "^2.1.0"
21682172
pgpass "1.x"
21692173
optionalDependencies:
@@ -2284,6 +2288,13 @@ [email protected]:
22842288
dependencies:
22852289
side-channel "^1.0.6"
22862290

2291+
qs@^6.14.0:
2292+
version "6.14.0"
2293+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
2294+
integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
2295+
dependencies:
2296+
side-channel "^1.1.0"
2297+
22872298
[email protected]:
22882299
version "0.2.0"
22892300
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -2527,7 +2538,7 @@ side-channel-weakmap@^1.0.2:
25272538
object-inspect "^1.13.3"
25282539
side-channel-map "^1.0.1"
25292540

2530-
side-channel@^1.0.6:
2541+
side-channel@^1.0.6, side-channel@^1.1.0:
25312542
version "1.1.0"
25322543
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
25332544
integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
@@ -2794,6 +2805,15 @@ type-check@^0.4.0, type-check@~0.4.0:
27942805
dependencies:
27952806
prelude-ls "^1.2.1"
27962807

2808+
type-is@^2.0.0:
2809+
version "2.0.0"
2810+
resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.0.tgz#7d249c2e2af716665cc149575dadb8b3858653af"
2811+
integrity sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==
2812+
dependencies:
2813+
content-type "^1.0.5"
2814+
media-typer "^1.1.0"
2815+
mime-types "^3.0.0"
2816+
27972817
type-is@~1.6.18:
27982818
version "1.6.18"
27992819
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"

‎docker/rootfs/etc/nginx/conf.d/include/ssl-cache-stream.conf

-2
This file was deleted.

‎docker/rootfs/etc/nginx/conf.d/include/ssl-cache.conf

-2
This file was deleted.

‎frontend/js/app/nginx/certificates/list/item.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@
6565
</div>
6666
</div>
6767
</td>
68-
<% } %>
68+
<% } %>

0 commit comments

Comments
 (0)