From 6315fa2cf0e6783835c4d9a8469c341ccd7c9282 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 8 Feb 2021 18:32:19 +0300 Subject: [PATCH] always overvwrite config.php with bundled one on startup --- src/app/startup.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/app/startup.sh b/src/app/startup.sh index 9da80fe..f17a929 100755 --- a/src/app/startup.sh +++ b/src/app/startup.sh @@ -65,15 +65,7 @@ elif ! $PSQL -c 'select * from ttrss_version'; then $PSQL < /var/www/html/tt-rss/schema/ttrss_schema_pgsql.sql fi -if [ ! -s $DST_DIR/config.php ]; then - cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php -else - if ! egrep -q 'SELF_URL_PATH.*getenv' $DST_DIR/config.php; then - echo -e "\nWARNING: you're using old-style config.php, overrides via .env will not work.\n" >/dev/stderr - else - cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php - fi -fi +cp ${SCRIPT_ROOT}/config.docker.php $DST_DIR/config.php # this was previously generated rm -f $DST_DIR/config.php.bak