diff --git a/.env.dist b/.env.dist index 44bfbf42..4c0b202a 100644 --- a/.env.dist +++ b/.env.dist @@ -33,6 +33,5 @@ MQTT_CERT=/location/of/cert/file.crt REDIS_CLIENT_SCHEME=tcp REDIS_CLIENT_HOST=127.0.0.1 REDIS_CLIENT_PORT=6379 -REDIS_CLIENT_CERTFILE=/location/of/cert/file.crt REDIS_CLIENT_PASSWORD=foobared # diff --git a/config/services.yaml b/config/services.yaml index 27efa248..bf607603 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -80,7 +80,6 @@ services: $scheme: "%env(REDIS_CLIENT_SCHEME)%" $host: "%env(REDIS_CLIENT_HOST)%" $port: "%env(REDIS_CLIENT_PORT)%" - $cert_file: "%env(REDIS_CLIENT_CERTFILE)%" $password: "%env(REDIS_CLIENT_PASSWORD)%" $env_flag: "dev" diff --git a/src/Service/RedisClient.php b/src/Service/RedisClient.php index 9339a252..43323e0f 100644 --- a/src/Service/RedisClient.php +++ b/src/Service/RedisClient.php @@ -10,16 +10,14 @@ class RedisClient protected $scheme; protected $host; protected $port; - protected $cert_file; protected $password; protected $env_flag; - public function __construct($scheme, $host, $port, $cert_file, $password, $env_flag) + public function __construct($scheme, $host, $port, $password, $env_flag) { $this->scheme = $scheme; $this->host = $host; $this->port = $port; - $this->cert_file = $cert_file; $this->password = $password; $this->env_flag = $env_flag; } @@ -39,8 +37,7 @@ class RedisClient "scheme"=>$this->scheme, "host"=>$this->host, "port"=>$this->port, - "ssl"=>["cafile"=>$cert_file, "verify_peer"=>true], - "password"=>$password]); + "password"=>$this->password]); } return $this->redis; }