Runs update.sh

9 files changed, 54 insertions, 0 deletions

diff --git a/26/apache/config/s3.config.php b/26/apache/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/26/apache/config/s3.config.php
+++ b/26/apache/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/26/fpm-alpine/config/s3.config.php b/26/fpm-alpine/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/26/fpm-alpine/config/s3.config.php
+++ b/26/fpm-alpine/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/26/fpm/config/s3.config.php b/26/fpm/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/26/fpm/config/s3.config.php
+++ b/26/fpm/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/27/apache/config/s3.config.php b/27/apache/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/27/apache/config/s3.config.php
+++ b/27/apache/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/27/fpm-alpine/config/s3.config.php b/27/fpm-alpine/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/27/fpm-alpine/config/s3.config.php
+++ b/27/fpm-alpine/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/27/fpm/config/s3.config.php b/27/fpm/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/27/fpm/config/s3.config.php
+++ b/27/fpm/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/28/apache/config/s3.config.php b/28/apache/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/28/apache/config/s3.config.php
+++ b/28/apache/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/28/fpm-alpine/config/s3.config.php b/28/fpm-alpine/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/28/fpm-alpine/config/s3.config.php
+++ b/28/fpm-alpine/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }
diff --git a/28/fpm/config/s3.config.php b/28/fpm/config/s3.config.php
index 38040ded..374cba2d 100644
--- a/28/fpm/config/s3.config.php
+++ b/28/fpm/config/s3.config.php
@@ -39,4 +39,10 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
   } else {
     $CONFIG['objectstore']['arguments']['secret'] = '';
   }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
 }