From fb14e30feb0ee224c79adda729dd82d3371ab262 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Mon, 27 Jun 2016 05:19:12 +0200 Subject: [PATCH] Remove owncloud log configuration from initial setup and only apply it during the configuration updates. This applies to both the timezone and the log format --- setup/owncloud.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup/owncloud.sh b/setup/owncloud.sh index e8d1df1..7904524 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -92,7 +92,6 @@ if [ ! -f $STORAGE_ROOT/owncloud/owncloud.db ]; then mkdir -p $STORAGE_ROOT/owncloud # Create an initial configuration file. - TIMEZONE=$(cat /etc/timezone) instanceid=oc$(echo $PRIMARY_HOSTNAME | sha1sum | fold -w 10 | head -n 1) cat > $STORAGE_ROOT/owncloud/config.php < '', 'mail_from_address' => 'owncloud', 'mail_domain' => '$PRIMARY_HOSTNAME', - 'logtimezone' => '$TIMEZONE', - 'logdateformat' => 'Y-m-d H:i:s', ); ?> EOF @@ -166,6 +163,7 @@ fi # * Some settings weren't included in previous versions of Mail-in-a-Box. # * We need to set the timezone to the system timezone to allow fail2ban to ban # 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. TIMEZONE=$(cat /etc/timezone) CONFIG_TEMP=$(/bin/mktemp)