From 8cfc53adbac38d392b5c03df6ce6df7c0b7111db Mon Sep 17 00:00:00 2001
From: Armin <armin@wurzweb.com>
Date: Tue, 24 Oct 2023 11:09:31 +0200
Subject: [PATCH] Now security.php is created properly if
 $ENCRYPT_SECRET_BOX_KEY is et and $ENCRYPT_KEYPAIR is missing

---
 5.0/apache/entrypoint.sh     | 2 +-
 5.0/fpm-alpine/entrypoint.sh | 2 +-
 5.0/fpm/entrypoint.sh        | 2 +-
 6.0/apache/entrypoint.sh     | 2 +-
 6.0/fpm-alpine/entrypoint.sh | 2 +-
 6.0/fpm/entrypoint.sh        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/5.0/apache/entrypoint.sh b/5.0/apache/entrypoint.sh
index 752789d..397cf4c 100755
--- a/5.0/apache/entrypoint.sh
+++ b/5.0/apache/entrypoint.sh
@@ -153,7 +153,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
diff --git a/5.0/fpm-alpine/entrypoint.sh b/5.0/fpm-alpine/entrypoint.sh
index 93345b4..ccbdefb 100755
--- a/5.0/fpm-alpine/entrypoint.sh
+++ b/5.0/fpm-alpine/entrypoint.sh
@@ -146,7 +146,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
diff --git a/5.0/fpm/entrypoint.sh b/5.0/fpm/entrypoint.sh
index 93345b4..ccbdefb 100755
--- a/5.0/fpm/entrypoint.sh
+++ b/5.0/fpm/entrypoint.sh
@@ -146,7 +146,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
diff --git a/6.0/apache/entrypoint.sh b/6.0/apache/entrypoint.sh
index 752789d..397cf4c 100755
--- a/6.0/apache/entrypoint.sh
+++ b/6.0/apache/entrypoint.sh
@@ -153,7 +153,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
diff --git a/6.0/fpm-alpine/entrypoint.sh b/6.0/fpm-alpine/entrypoint.sh
index 93345b4..ccbdefb 100755
--- a/6.0/fpm-alpine/entrypoint.sh
+++ b/6.0/fpm-alpine/entrypoint.sh
@@ -146,7 +146,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
diff --git a/6.0/fpm/entrypoint.sh b/6.0/fpm/entrypoint.sh
index 93345b4..ccbdefb 100755
--- a/6.0/fpm/entrypoint.sh
+++ b/6.0/fpm/entrypoint.sh
@@ -146,7 +146,7 @@ if [ -f application/config/security.php ]; then
     echo 'Info: security.php already provisioned'
 else
     echo 'Info: Creating security.php'
-    if [ -n "$ENCRYPT_KEYPAIR" ]; then
+    if [ -n "$ENCRYPT_KEYPAIR" ] || [ -n "$ENCRYPT_SECRET_BOX_KEY" ]; then
 
         cat <<EOF > application/config/security.php
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');