Skip to content

Commit bf8136a

Browse files
author
GitHub Workflow
committed
Runs update.sh
1 parent 2accbec commit bf8136a

27 files changed

Lines changed: 54 additions & 54 deletions

‎27/apache/config/redis.config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'memcache.locking' => '\OC\Memcache\Redis',
66
'redis' => array(
77
'host' => getenv('REDIS_HOST'),
8-
'password' => getenv('REDIS_HOST_PASSWORD_FILE') && file_exists(getenv('REDIS_HOST_PASSWORD_FILE')) ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
8+
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
99
),
1010
);
1111

‎27/apache/config/s3.config.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
)
2525
);
2626

27-
if (getenv('OBJECTSTORE_S3_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_KEY_FILE'))) {
27+
if (getenv('OBJECTSTORE_S3_KEY_FILE')) {
2828
$CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
2929
} elseif (getenv('OBJECTSTORE_S3_KEY')) {
3030
$CONFIG['objectstore']['arguments']['key'] = getenv('OBJECTSTORE_S3_KEY');
3131
} else {
3232
$CONFIG['objectstore']['arguments']['key'] = '';
3333
}
3434

35-
if (getenv('OBJECTSTORE_S3_SECRET_FILE') && file_exists(getenv('OBJECTSTORE_S3_SECRET_FILE'))) {
35+
if (getenv('OBJECTSTORE_S3_SECRET_FILE')) {
3636
$CONFIG['objectstore']['arguments']['secret'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SECRET_FILE')));
3737
} elseif (getenv('OBJECTSTORE_S3_SECRET')) {
3838
$CONFIG['objectstore']['arguments']['secret'] = getenv('OBJECTSTORE_S3_SECRET');
3939
} else {
4040
$CONFIG['objectstore']['arguments']['secret'] = '';
4141
}
4242

43-
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
43+
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
4444
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
4545
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
4646
$CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');

‎27/apache/config/smtp.config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
'mail_smtphost' => getenv('SMTP_HOST'),
66
'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
77
'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
8-
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))),
8+
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || getenv('SMTP_PASSWORD_FILE')),
99
'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
1010
'mail_smtpname' => getenv('SMTP_NAME') ?: '',
1111
'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
1212
'mail_domain' => getenv('MAIL_DOMAIN'),
1313
);
1414

15-
if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
15+
if (getenv('SMTP_PASSWORD_FILE')) {
1616
$CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
1717
} elseif (getenv('SMTP_PASSWORD')) {
1818
$CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');

‎27/fpm-alpine/config/redis.config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'memcache.locking' => '\OC\Memcache\Redis',
66
'redis' => array(
77
'host' => getenv('REDIS_HOST'),
8-
'password' => getenv('REDIS_HOST_PASSWORD_FILE') && file_exists(getenv('REDIS_HOST_PASSWORD_FILE')) ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
8+
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
99
),
1010
);
1111

‎27/fpm-alpine/config/s3.config.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
)
2525
);
2626

27-
if (getenv('OBJECTSTORE_S3_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_KEY_FILE'))) {
27+
if (getenv('OBJECTSTORE_S3_KEY_FILE')) {
2828
$CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
2929
} elseif (getenv('OBJECTSTORE_S3_KEY')) {
3030
$CONFIG['objectstore']['arguments']['key'] = getenv('OBJECTSTORE_S3_KEY');
3131
} else {
3232
$CONFIG['objectstore']['arguments']['key'] = '';
3333
}
3434

35-
if (getenv('OBJECTSTORE_S3_SECRET_FILE') && file_exists(getenv('OBJECTSTORE_S3_SECRET_FILE'))) {
35+
if (getenv('OBJECTSTORE_S3_SECRET_FILE')) {
3636
$CONFIG['objectstore']['arguments']['secret'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SECRET_FILE')));
3737
} elseif (getenv('OBJECTSTORE_S3_SECRET')) {
3838
$CONFIG['objectstore']['arguments']['secret'] = getenv('OBJECTSTORE_S3_SECRET');
3939
} else {
4040
$CONFIG['objectstore']['arguments']['secret'] = '';
4141
}
4242

43-
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
43+
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
4444
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
4545
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
4646
$CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');

‎27/fpm-alpine/config/smtp.config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
'mail_smtphost' => getenv('SMTP_HOST'),
66
'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
77
'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
8-
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))),
8+
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || getenv('SMTP_PASSWORD_FILE')),
99
'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
1010
'mail_smtpname' => getenv('SMTP_NAME') ?: '',
1111
'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
1212
'mail_domain' => getenv('MAIL_DOMAIN'),
1313
);
1414

15-
if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
15+
if (getenv('SMTP_PASSWORD_FILE')) {
1616
$CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
1717
} elseif (getenv('SMTP_PASSWORD')) {
1818
$CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');

‎27/fpm/config/redis.config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'memcache.locking' => '\OC\Memcache\Redis',
66
'redis' => array(
77
'host' => getenv('REDIS_HOST'),
8-
'password' => getenv('REDIS_HOST_PASSWORD_FILE') && file_exists(getenv('REDIS_HOST_PASSWORD_FILE')) ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
8+
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
99
),
1010
);
1111

‎27/fpm/config/s3.config.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424
)
2525
);
2626

27-
if (getenv('OBJECTSTORE_S3_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_KEY_FILE'))) {
27+
if (getenv('OBJECTSTORE_S3_KEY_FILE')) {
2828
$CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
2929
} elseif (getenv('OBJECTSTORE_S3_KEY')) {
3030
$CONFIG['objectstore']['arguments']['key'] = getenv('OBJECTSTORE_S3_KEY');
3131
} else {
3232
$CONFIG['objectstore']['arguments']['key'] = '';
3333
}
3434

35-
if (getenv('OBJECTSTORE_S3_SECRET_FILE') && file_exists(getenv('OBJECTSTORE_S3_SECRET_FILE'))) {
35+
if (getenv('OBJECTSTORE_S3_SECRET_FILE')) {
3636
$CONFIG['objectstore']['arguments']['secret'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SECRET_FILE')));
3737
} elseif (getenv('OBJECTSTORE_S3_SECRET')) {
3838
$CONFIG['objectstore']['arguments']['secret'] = getenv('OBJECTSTORE_S3_SECRET');
3939
} else {
4040
$CONFIG['objectstore']['arguments']['secret'] = '';
4141
}
4242

43-
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
43+
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
4444
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
4545
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
4646
$CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');

‎27/fpm/config/smtp.config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
'mail_smtphost' => getenv('SMTP_HOST'),
66
'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
77
'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
8-
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))),
8+
'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || getenv('SMTP_PASSWORD_FILE')),
99
'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
1010
'mail_smtpname' => getenv('SMTP_NAME') ?: '',
1111
'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
1212
'mail_domain' => getenv('MAIL_DOMAIN'),
1313
);
1414

15-
if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
15+
if (getenv('SMTP_PASSWORD_FILE')) {
1616
$CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
1717
} elseif (getenv('SMTP_PASSWORD')) {
1818
$CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');

‎28/apache/config/redis.config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'memcache.locking' => '\OC\Memcache\Redis',
66
'redis' => array(
77
'host' => getenv('REDIS_HOST'),
8-
'password' => getenv('REDIS_HOST_PASSWORD_FILE') && file_exists(getenv('REDIS_HOST_PASSWORD_FILE')) ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
8+
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
99
),
1010
);
1111

0 commit comments

Comments
 (0)