diff --git a/docker/compose/docker-compose.postgres.yml b/docker/compose/docker-compose.postgres.yml index 5b7e856cd..bb5b2dd3e 100644 --- a/docker/compose/docker-compose.postgres.yml +++ b/docker/compose/docker-compose.postgres.yml @@ -43,7 +43,6 @@ services: POSTGRES_DB: paperless POSTGRES_USER: paperless POSTGRES_PASSWORD: paperless - POSTGRES_HOST_AUTH_METHOD: trust webserver: image: ghcr.io/paperless-ngx/paperless-ngx:latest diff --git a/install-paperless-ngx.sh b/install-paperless-ngx.sh index b7f7c846a..38698ff87 100755 --- a/install-paperless-ngx.sh +++ b/install-paperless-ngx.sh @@ -74,12 +74,13 @@ fi # Added handling for timezone for busybox based linux, not having timedatectl available (i.e. QNAP QTS) # if neither timedatectl nor /etc/TZ is suceeding, defaulting to GMT. if command -v timedatectl &> /dev/null ; then - default_time_zone=$(timedatectl show -p Timezone --value) + default_time_zone=$(timedatectl show -p Timezone --value) elif [ -f /etc/TZ ] && [ -f /etc/tzlist ] ; then - TZ=$(cat /etc/TZ) - default_time_zone=$(grep -B 1 -m 1 "$TZ" /etc/tzlist | head -1 | cut -f 2 -d =) + TZ=$(cat /etc/TZ) + default_time_zone=$(grep -B 1 -m 1 "$TZ" /etc/tzlist | head -1 | cut -f 2 -d =) else - default_time_zone="Europe/London" + echo "WARN: unable to detect timezone, defaulting to Etc/UTC" + default_time_zone="Etc/UTC" fi set -e