diff options
author | Tilo Spannagel <development@tilosp.de> | 2020-09-10 16:50:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-10 16:50:11 +0200 |
commit | d062f5306cdc0e2ad2e79ba7d7cad02a487a8f9a (patch) | |
tree | 1dd7138980ad6875e957af9066ef3696eedab0b2 /18.0-rc/apache/config/s3.config.php | |
parent | d0ee4bc215e96245cd563114f15dc1146e7058c1 (diff) | |
parent | c20b15d30c64f66d1f6dbe847741d4b5d0af4ad9 (diff) |
Merge pull request #1245 from tilosp/bot/update
Run update.sh
Diffstat (limited to '18.0-rc/apache/config/s3.config.php')
-rw-r--r-- | 18.0-rc/apache/config/s3.config.php | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/18.0-rc/apache/config/s3.config.php b/18.0-rc/apache/config/s3.config.php deleted file mode 100644 index 6376d8f6..00000000 --- a/18.0-rc/apache/config/s3.config.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -if (getenv('OBJECTSTORE_S3_BUCKET')) { - $use_ssl = getenv('OBJECTSTORE_S3_SSL'); - $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); - $CONFIG = array( - 'objectstore' => array( - 'class' => '\OC\Files\ObjectStore\S3', - 'arguments' => array( - 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'), - 'key' => getenv('OBJECTSTORE_S3_KEY') ?: '', - 'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '', - 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', - 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', - 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', - 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true, - // required for some non Amazon S3 implementations - 'use_path_style' => $use_path == true && strtolower($use_path) !== 'false' - ) - ) - ); -} |