public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-07-24 21:53:31 +00:00
Code Issues Releases Wiki Activity

migrate from redis to valkey

Browse Source
This commit is contained in:
FreddleSpl0it
2025-02-28 15:36:19 +01:00
parent 35a6f81d0d
commit c27000215e
80 changed files with 754 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/web/autodiscover.php
+13 -13
View File
@@ -7,16 +7,16 @@ if(file_exists('inc/vars.local.inc.php')) {
}
$autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
// Redis
$redis = new Redis();
// Valkey
$valkey = new Redis();
try {
if (!empty(getenv('REDIS_SLAVEOF_IP'))) {
$redis->connect(getenv('REDIS_SLAVEOF_IP'), getenv('REDIS_SLAVEOF_PORT'));
if (!empty(getenv('VALKEY_SLAVEOF_IP'))) {
$valkey->connect(getenv('VALKEY_SLAVEOF_IP'), getenv('VALKEY_SLAVEOF_PORT'));
}
else {
$redis->connect('redis-mailcow', 6379);
$valkey->connect('valkey-mailcow', 6379);
}
$redis->auth(getenv("REDISPASS"));
$valkey->auth(getenv("VALKEYPASS"));
}
catch (Exception $e) {
exit;
@@ -63,7 +63,7 @@ if (empty($_SERVER['PHP_AUTH_USER']) || empty($_SERVER['PHP_AUTH_PW'])) {
"service" => "Error: must be authenticated"
)
);
$redis->lPush('AUTODISCOVER_LOG', $json);
$valkey->lPush('AUTODISCOVER_LOG', $json);
header('WWW-Authenticate: Basic realm="' . $_SERVER['HTTP_HOST'] . '"');
header('HTTP/1.0 401 Unauthorized');
exit(0);
@@ -88,13 +88,13 @@ if ($login_role === "user") {
"service" => "Error: invalid or missing request data"
)
);
$redis->lPush('AUTODISCOVER_LOG', $json);
$redis->lTrim('AUTODISCOVER_LOG', 0, 100);
$valkey->lPush('AUTODISCOVER_LOG', $json);
$valkey->lTrim('AUTODISCOVER_LOG', 0, 100);
}
catch (RedisException $e) {
$_SESSION['return'][] = array(
'type' => 'danger',
'msg' => 'Redis: '.$e
'msg' => 'Valkey: '.$e
);
return false;
}
@@ -143,13 +143,13 @@ if ($login_role === "user") {
"service" => $autodiscover_config['autodiscoverType']
)
);
$redis->lPush('AUTODISCOVER_LOG', $json);
$redis->lTrim('AUTODISCOVER_LOG', 0, 100);
$valkey->lPush('AUTODISCOVER_LOG', $json);
$valkey->lTrim('AUTODISCOVER_LOG', 0, 100);
}
catch (RedisException $e) {
$_SESSION['return'][] = array(
'type' => 'danger',
'msg' => 'Redis: '.$e
'msg' => 'Valkey: '.$e
);
return false;
}