kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Remove some complex log options

Browse Source
This commit is contained in:
James Cole
2023-10-30 06:35:08 +01:00
parent a3a412d553
commit e9ef7d4144
3 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
config/database.php
View File

@@ -51,26 +51,26 @@ $mysql_ssl_verify = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null);
$mySqlSSLOptions = [];
$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
if (false !== $useSSL && null !== $useSSL) {
if (null !== $mysql_ssl_ca_dir) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;
}
if (null !== $mysql_ssl_ca_file) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CA] = $mysql_ssl_ca_file;
}
if (null !== $mysql_ssl_cert) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CERT] = $mysql_ssl_cert;
}
if (null !== $mysql_ssl_key) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_KEY] = $mysql_ssl_key;
}
if (null !== $mysql_ssl_ciphers) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CIPHER] = $mysql_ssl_ciphers;
}
if (null !== $mysql_ssl_verify) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $mysql_ssl_verify;
}
}
//if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) {
// if (null !== $mysql_ssl_ca_dir) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;
// }
// if (null !== $mysql_ssl_ca_file) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CA] = $mysql_ssl_ca_file;
// }
// if (null !== $mysql_ssl_cert) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CERT] = $mysql_ssl_cert;
// }
// if (null !== $mysql_ssl_key) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_KEY] = $mysql_ssl_key;
// }
// if (null !== $mysql_ssl_ciphers) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CIPHER] = $mysql_ssl_ciphers;
// }
// if (null !== $mysql_ssl_verify) {
// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $mysql_ssl_verify;
// }
//}
return [
'default' => envNonEmpty('DB_CONNECTION', 'mysql'),
@@ -138,7 +138,7 @@ return [
'client' => env('REDIS_CLIENT', 'predis'),
'options' => [
'cluster' => env('REDIS_CLUSTER', 'predis'),
'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
//'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
],
'default' => [
'scheme' => envNonEmpty('REDIS_SCHEME', 'tcp'),

6
config/user_roles.php
View File

@@ -28,7 +28,7 @@ use FireflyIII\Enums\UserRoleEnum;
$result = [];
foreach (UserRoleEnum::cases() as $role) {
$result[$role->value] = [];
}
//foreach (UserRoleEnum::cases() as $role) {
// $result[$role->value] = [];
//}
return $result;