diff --git a/app/startup.sh b/app/startup.sh index e249bcb..8cf9d07 100755 --- a/app/startup.sh +++ b/app/startup.sh @@ -74,15 +74,7 @@ elif ! $PSQL -c 'select * from ttrss_version'; then cat /var/www/html/tt-rss/schema/ttrss_schema_pgsql.sql | sed 's/tt-rss.spb.ru/tt-rss.org/g' | $PSQL 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