From 5f7c0a242adad8fb2724a2ac75c2c1810f0d581f Mon Sep 17 00:00:00 2001 From: Tobias Batch Date: Tue, 29 Aug 2023 14:17:21 +0100 Subject: [PATCH 1/2] fix: removed switch for 1.x in startup --- assets/startup.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/assets/startup.sh b/assets/startup.sh index 59a7851..152f5cc 100755 --- a/assets/startup.sh +++ b/assets/startup.sh @@ -45,17 +45,10 @@ function config() { function handleStartup() { # set mem limits and copy in custom logger config sed -i "s/memory_limit.*/memory_limit=$memory_limit/g" /usr/local/etc/php/php.ini - if [ "${KIMAI:0:1}" -lt "2" ]; then - cp /assets/monolog-prod.yaml /opt/kimai/config/packages/prod/monolog.yaml - cp /assets/monolog-dev.yaml /opt/kimai/config/packages/dev/monolog.yaml - else - cp /assets/monolog.yaml /opt/kimai/config/packages/monolog.yaml - fi + cp /assets/monolog.yaml /opt/kimai/config/packages/monolog.yaml tar -zx -C /opt/kimai -f /var/tmp/public.tgz - - if [ -z "$USER_ID" ]; then USER_ID=$(id -u www-data) fi From a3725cd313bc2fe1e12813dae6a91c6ef9aedcd5 Mon Sep 17 00:00:00 2001 From: Tobias Batch Date: Tue, 29 Aug 2023 14:20:59 +0100 Subject: [PATCH 2/2] fix: removed old logging files --- assets/monolog-dev.yaml | 6 ------ assets/monolog-prod.yaml | 6 ------ 2 files changed, 12 deletions(-) delete mode 100644 assets/monolog-dev.yaml delete mode 100644 assets/monolog-prod.yaml diff --git a/assets/monolog-dev.yaml b/assets/monolog-dev.yaml deleted file mode 100644 index 3e8cef3..0000000 --- a/assets/monolog-dev.yaml +++ /dev/null @@ -1,6 +0,0 @@ -monolog: - handlers: - main: - type: stream - level: debug - path: "php://stderr" diff --git a/assets/monolog-prod.yaml b/assets/monolog-prod.yaml deleted file mode 100644 index 95cf4a6..0000000 --- a/assets/monolog-prod.yaml +++ /dev/null @@ -1,6 +0,0 @@ -monolog: - handlers: - main: - type: stream - level: error - path: "php://stderr"