From a05104eb94dfd8979685ba6c0640629d071726d3 Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Wed, 12 Oct 2016 13:35:42 +0200 Subject: [PATCH] nextcloud: persistent timezone variable --- nextcloud/10.0/run.sh | 2 ++ nextcloud/10.0/setup.sh | 1 - nextcloud/daily/run.sh | 2 ++ nextcloud/daily/setup.sh | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nextcloud/10.0/run.sh b/nextcloud/10.0/run.sh index 16b4785..280907e 100644 --- a/nextcloud/10.0/run.sh +++ b/nextcloud/10.0/run.sh @@ -5,6 +5,8 @@ sed -i -e "s//$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph -e "s//$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run +echo ${TZ:-UTC} >/etc/timezone + # Put the configuration and apps into volumes ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null ln -sf /apps2 /nextcloud &>/dev/null diff --git a/nextcloud/10.0/setup.sh b/nextcloud/10.0/setup.sh index 4ebe925..a3059df 100755 --- a/nextcloud/10.0/setup.sh +++ b/nextcloud/10.0/setup.sh @@ -79,7 +79,6 @@ echo "Automatic configuration finished." # users within the proper timeframe # * We need to set the logdateformat to something that will work correctly with fail2ban # Use PHP to read the settings file, modify it, and write out the new settings array. -echo ${TZ:-UTC} >/etc/timezone TIMEZONE=$(cat /etc/timezone) CONFIG_TEMP=$(/bin/mktemp) diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh index 16b4785..280907e 100644 --- a/nextcloud/daily/run.sh +++ b/nextcloud/daily/run.sh @@ -5,6 +5,8 @@ sed -i -e "s//$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph -e "s//$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run +echo ${TZ:-UTC} >/etc/timezone + # Put the configuration and apps into volumes ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null ln -sf /apps2 /nextcloud &>/dev/null diff --git a/nextcloud/daily/setup.sh b/nextcloud/daily/setup.sh index 4ebe925..a3059df 100755 --- a/nextcloud/daily/setup.sh +++ b/nextcloud/daily/setup.sh @@ -79,7 +79,6 @@ echo "Automatic configuration finished." # users within the proper timeframe # * We need to set the logdateformat to something that will work correctly with fail2ban # Use PHP to read the settings file, modify it, and write out the new settings array. -echo ${TZ:-UTC} >/etc/timezone TIMEZONE=$(cat /etc/timezone) CONFIG_TEMP=$(/bin/mktemp)