From 9dfcbab710cb3cded19783c86ff137fd080f3f66 Mon Sep 17 00:00:00 2001 From: Lars Gebhardt-Kusche Date: Fri, 6 Mar 2026 00:07:20 +0100 Subject: [PATCH] asdasd --- modules/pi_control/bootstrap.php | 8 ++++---- modules/pi_control/pages/console.php | 4 ++-- tools/pi_control/worker.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/pi_control/bootstrap.php b/modules/pi_control/bootstrap.php index a84a1f4..5ed8314 100644 --- a/modules/pi_control/bootstrap.php +++ b/modules/pi_control/bootstrap.php @@ -35,10 +35,10 @@ $mm->registerFunction($moduleName, 'pdo', function () use ($moduleName): \PDO { $mm->registerFunction($moduleName, 'redis', function () use ($moduleName) { $settings = modules()->settings($moduleName); $redis = (array)($settings['redis'] ?? []); - $host = (string)($redis['host'] ?? 'redis'); - $port = (int)($redis['port'] ?? 6379); - $password = (string)($redis['password'] ?? ''); - $db = (int)($redis['db'] ?? 0); + $host = (string)($redis['host'] ?? getenv('PI_CONTROL_REDIS_HOST') ?: 'redis'); + $port = (int)($redis['port'] ?? (getenv('PI_CONTROL_REDIS_PORT') !== false ? (int)getenv('PI_CONTROL_REDIS_PORT') : 6379)); + $password = (string)($redis['password'] ?? getenv('PI_CONTROL_REDIS_PASSWORD') ?: ''); + $db = (int)($redis['db'] ?? (getenv('PI_CONTROL_REDIS_DB') !== false ? (int)getenv('PI_CONTROL_REDIS_DB') : 0)); return new \App\RedisClient($host, $port, $password !== '' ? $password : null, $db); }); diff --git a/modules/pi_control/pages/console.php b/modules/pi_control/pages/console.php index 2c66947..29b0b4e 100644 --- a/modules/pi_control/pages/console.php +++ b/modules/pi_control/pages/console.php @@ -13,9 +13,9 @@ $terminalToken = null; $settings = modules()->settings('pi_control'); $ttydUrl = trim((string)($settings['ttyd_url'] ?? '/ttyd')); $defaultProvider = 'ttyd'; -$defaultTimeout = (int)($settings['exec_default_timeout'] ?? 300); +$defaultTimeout = (int)($settings['exec_default_timeout'] ?? (getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') !== false ? (int)getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') : 300)); $defaultTimeout = $defaultTimeout > 0 ? $defaultTimeout : 300; -$queueName = (string)($settings['redis']['queue'] ?? 'pi_control:queue'); +$queueName = (string)($settings['redis']['queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue')); $tokenTtl = (int)($settings['terminal_token_ttl'] ?? 10); $tokenTtl = $tokenTtl > 0 ? $tokenTtl : 10; diff --git a/tools/pi_control/worker.php b/tools/pi_control/worker.php index 6e1c71d..513e56c 100644 --- a/tools/pi_control/worker.php +++ b/tools/pi_control/worker.php @@ -14,8 +14,8 @@ $table = fn(string $name) => module_fn($module, 'table', $name); $redis = module_fn($module, 'redis'); $settings = modules()->settings($module); -$queueName = (string)($settings['redis']['queue'] ?? 'pi_control:queue'); -$defaultTimeout = (int)($settings['exec_default_timeout'] ?? 300); +$queueName = (string)($settings['redis']['queue'] ?? (getenv('PI_CONTROL_REDIS_QUEUE') ?: 'pi_control:queue')); +$defaultTimeout = (int)($settings['exec_default_timeout'] ?? (getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') !== false ? (int)getenv('PI_CONTROL_EXEC_DEFAULT_TIMEOUT') : 300)); $defaultTimeout = $defaultTimeout > 0 ? $defaultTimeout : 300; $strictHostKey = getenv('PI_CONTROL_STRICT_HOSTKEY') === '1';