From 6ef8de9c85a010d1b5d31377a247d9b45c2a15f2 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Tue, 23 Feb 2021 01:09:34 +0000 Subject: [PATCH] Runs update.sh --- 19.0-rc/apache/config/s3.config.php | 3 +++ 19.0-rc/fpm-alpine/config/s3.config.php | 3 +++ 19.0-rc/fpm/config/s3.config.php | 3 +++ 19.0/apache/config/s3.config.php | 3 +++ 19.0/fpm-alpine/config/s3.config.php | 3 +++ 19.0/fpm/config/s3.config.php | 3 +++ 20.0-rc/apache/config/s3.config.php | 3 +++ 20.0-rc/fpm-alpine/config/s3.config.php | 3 +++ 20.0-rc/fpm/config/s3.config.php | 3 +++ 20.0/apache/config/s3.config.php | 3 +++ 20.0/fpm-alpine/config/s3.config.php | 3 +++ 20.0/fpm/config/s3.config.php | 3 +++ 21.0/apache/config/s3.config.php | 3 +++ 21.0/fpm-alpine/config/s3.config.php | 3 +++ 21.0/fpm/config/s3.config.php | 3 +++ 15 files changed, 45 insertions(+) diff --git a/19.0-rc/apache/config/s3.config.php b/19.0-rc/apache/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0-rc/apache/config/s3.config.php +++ b/19.0-rc/apache/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/19.0-rc/fpm-alpine/config/s3.config.php b/19.0-rc/fpm-alpine/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0-rc/fpm-alpine/config/s3.config.php +++ b/19.0-rc/fpm-alpine/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/19.0-rc/fpm/config/s3.config.php b/19.0-rc/fpm/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0-rc/fpm/config/s3.config.php +++ b/19.0-rc/fpm/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/19.0/apache/config/s3.config.php b/19.0/apache/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0/apache/config/s3.config.php +++ b/19.0/apache/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/19.0/fpm-alpine/config/s3.config.php b/19.0/fpm-alpine/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0/fpm-alpine/config/s3.config.php +++ b/19.0/fpm-alpine/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/19.0/fpm/config/s3.config.php b/19.0/fpm/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/19.0/fpm/config/s3.config.php +++ b/19.0/fpm/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0-rc/apache/config/s3.config.php b/20.0-rc/apache/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0-rc/apache/config/s3.config.php +++ b/20.0-rc/apache/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0-rc/fpm-alpine/config/s3.config.php b/20.0-rc/fpm-alpine/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0-rc/fpm-alpine/config/s3.config.php +++ b/20.0-rc/fpm-alpine/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0-rc/fpm/config/s3.config.php b/20.0-rc/fpm/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0-rc/fpm/config/s3.config.php +++ b/20.0-rc/fpm/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0/apache/config/s3.config.php b/20.0/apache/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0/apache/config/s3.config.php +++ b/20.0/apache/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0/fpm-alpine/config/s3.config.php b/20.0/fpm-alpine/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0/fpm-alpine/config/s3.config.php +++ b/20.0/fpm-alpine/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/20.0/fpm/config/s3.config.php b/20.0/fpm/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/20.0/fpm/config/s3.config.php +++ b/20.0/fpm/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/21.0/apache/config/s3.config.php b/21.0/apache/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/21.0/apache/config/s3.config.php +++ b/21.0/apache/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/21.0/fpm-alpine/config/s3.config.php b/21.0/fpm-alpine/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/21.0/fpm-alpine/config/s3.config.php +++ b/21.0/fpm-alpine/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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' diff --git a/21.0/fpm/config/s3.config.php b/21.0/fpm/config/s3.config.php index 6376d8f6..9a19e96f 100644 --- a/21.0/fpm/config/s3.config.php +++ b/21.0/fpm/config/s3.config.php @@ -2,6 +2,7 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { $use_ssl = getenv('OBJECTSTORE_S3_SSL'); $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); + $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE'); $CONFIG = array( 'objectstore' => array( 'class' => '\OC\Files\ObjectStore\S3', @@ -12,6 +13,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) { 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', + 'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:", + 'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true, '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'