Skip to content

Commit 91ec3c7

Browse files
committed
chore: Update default proxy port
1 parent d98ba59 commit 91ec3c7

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/data/composeTemplates.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ const generateEditorEnv = (config, deploymentType) => {
7272
if (!useEmbeddedProxy) {
7373
// External proxy - use configured host (127.0.0.1 for VPN, m3u-proxy for others)
7474
addEnvVar(envVars, 'M3U_PROXY_HOST', config.M3U_PROXY_HOST || 'm3u-proxy');
75-
addEnvVar(envVars, 'M3U_PROXY_PORT', '8085'); // Internal container port
75+
addEnvVar(envVars, 'M3U_PROXY_PORT', config.M3U_PROXY_PORT || '38085'); // Internal container port
7676
} else {
7777
// Embedded proxy - runs on localhost inside editor
7878
// ENABLE_TRANSCODING_POOLING is enabled by default for embedded, no need to set it
7979
addEnvVar(envVars, 'M3U_PROXY_HOST', 'localhost');
80-
addEnvVar(envVars, 'M3U_PROXY_PORT', config.M3U_PROXY_PORT || '8085');
80+
addEnvVar(envVars, 'M3U_PROXY_PORT', config.M3U_PROXY_PORT || '38085');
8181
}
8282

8383
addEnvVar(envVars, 'M3U_PROXY_TOKEN', config.M3U_PROXY_TOKEN);
@@ -173,6 +173,7 @@ const generateProxyService = (config, useVpnNetwork = false) => {
173173

174174
service += `
175175
environment:
176+
- PORT=${config.M3U_PROXY_PORT || '38085'}
176177
- API_TOKEN=\${M3U_PROXY_TOKEN:-${config.M3U_PROXY_TOKEN}}
177178
- REDIS_ENABLED=true
178179
- REDIS_HOST=${redisHost}
@@ -214,7 +215,7 @@ const generateProxyService = (config, useVpnNetwork = false) => {
214215
if (!useVpnNetwork) {
215216
service += `
216217
ports:
217-
- "${config.M3U_PROXY_PORT || '38085'}:8085"`;
218+
- "${config.M3U_PROXY_PORT || '38085'}:${config.M3U_PROXY_PORT || '38085'}"`;
218219
}
219220

220221
service += `
@@ -448,7 +449,7 @@ ${vpnEnv}
448449

449450
if (proxyExternal) {
450451
compose += `
451-
- "${config.M3U_PROXY_PORT || '38085'}:8085" # m3u-proxy`;
452+
- "${config.M3U_PROXY_PORT || '38085'}:${config.M3U_PROXY_PORT || '38085'}" # m3u-proxy`;
452453
}
453454

454455
compose += `
@@ -718,7 +719,7 @@ volumes:
718719
# encode gzip
719720
#
720721
# @proxy path /proxy/*
721-
# reverse_proxy @proxy m3u-proxy:8085
722+
# reverse_proxy @proxy m3u-proxy:${config.M3U_PROXY_PORT || '38085'}
722723
# }
723724
`;
724725

src/data/composeWizardConfig.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,6 @@ export const WIZARD_SECTIONS = [
213213
],
214214
deploymentTypes: ['modular', 'vpn', 'external-nginx', 'external-caddy'],
215215
},
216-
{
217-
name: 'M3U_PROXY_PORT',
218-
label: 'Proxy Port',
219-
description: 'Port for the proxy service',
220-
type: FIELD_TYPES.NUMBER,
221-
default: '38085',
222-
deploymentTypes: ['modular', 'aio', 'vpn', 'external-nginx', 'external-caddy'],
223-
},
224216
{
225217
name: 'M3U_PROXY_HOST',
226218
label: 'Proxy Host',
@@ -230,6 +222,14 @@ export const WIZARD_SECTIONS = [
230222
showWhen: { field: 'M3U_PROXY_ENABLED', value: 'external' },
231223
deploymentTypes: ['modular', 'vpn', 'external-nginx', 'external-caddy'],
232224
},
225+
{
226+
name: 'M3U_PROXY_PORT',
227+
label: 'Proxy Port',
228+
description: 'Port for the proxy service',
229+
type: FIELD_TYPES.NUMBER,
230+
default: '38085',
231+
deploymentTypes: ['modular', 'aio', 'vpn', 'external-nginx', 'external-caddy'],
232+
},
233233
{
234234
name: 'M3U_PROXY_TOKEN',
235235
label: 'Proxy Token',

0 commit comments

Comments
 (0)