Merge branch 'master' into master

This commit is contained in:
x86dev 2017-07-28 22:26:41 +02:00 committed by GitHub
commit 6b325708db

View File

@ -105,18 +105,32 @@ setup_ttrss()
fi
# If we've been passed $TTRSS_SELF_URL as an env variable, then use that,
# But if not, use the URL we constructed above
# otherwise use the URL we constructed above.
if [ -z "$TTRSS_SELF_URL" ]; then
# Construct the final URL TTRSS will use.
TTRSS_SELF_URL=${TTRSS_PROTO}://${TTRSS_URL}${TTRSS_PORT}/
fi
echo "Setup: URL is: $TTRSS_SELF_URL"
# Patch URL path.
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
# Enable additional system plugins: api_newsplus.
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', 'api_newsplus, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
# Enable additional system plugins.
if [ -z ${TTRSS_PLUGINS} ]; then
# api_newsplus (API for News+ Android App).
TTRSS_PLUGINS=api_newsplus
# Only if SSL/TLS is enabled: af_zz_imgproxy (Loads insecure images via built-in proxy).
if [ "$TTRSS_PROTO" = "https" ]; then
TTRSS_PLUGINS=${TTRSS_PLUGINS},af_zz_imgproxy
fi
fi
echo "Setup: Additional plugins: $TTRSS_PLUGINS"
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', '$TTRSS_PLUGINS, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
}
setup_db()