mirror of
https://github.com/cedar2025/Xboard.git
synced 2025-02-02 07:28:13 -05:00
Compare commits
No commits in common. "96df9305b6ba71a0e7bc611d6003de8c05943e4e" and "c9c72cc847b75fc39a4ed58072e4b2373d4908fe" have entirely different histories.
96df9305b6
...
c9c72cc847
@ -22,6 +22,4 @@ RUN composer install --optimize-autoloader --no-cache --no-dev \
|
|||||||
ENV ENABLE_WEB=true \
|
ENV ENABLE_WEB=true \
|
||||||
ENABLE_HORIZON=true \
|
ENABLE_HORIZON=true \
|
||||||
ENABLE_REDIS=false
|
ENABLE_REDIS=false
|
||||||
|
|
||||||
EXPOSE 7001
|
|
||||||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
@ -116,11 +116,9 @@ class UniProxyController extends Controller
|
|||||||
...$baseConfig,
|
...$baseConfig,
|
||||||
'tls' => (int) $protocolSettings['tls'],
|
'tls' => (int) $protocolSettings['tls'],
|
||||||
'flow' => $protocolSettings['flow'],
|
'flow' => $protocolSettings['flow'],
|
||||||
'tls_settings' =>
|
'tls_settings' => [...(int) $protocolSettings['tls'] === 1
|
||||||
match ((int) $protocolSettings['tls']) {
|
? $protocolSettings['tls_settings']
|
||||||
2 => $protocolSettings['reality_settings'],
|
: $protocolSettings['reality_settings']]
|
||||||
default => $protocolSettings['tls_settings']
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
'hysteria' => [
|
'hysteria' => [
|
||||||
'server_port' => (int) $serverPort,
|
'server_port' => (int) $serverPort,
|
||||||
|
@ -141,7 +141,7 @@ class Server extends Model
|
|||||||
|
|
||||||
private function castValueWithConfig($value, array $config)
|
private function castValueWithConfig($value, array $config)
|
||||||
{
|
{
|
||||||
if ($value === null && $config['type'] !== 'object') {
|
if ($value === null) {
|
||||||
return $config['default'] ?? null;
|
return $config['default'] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user