Merge branch 'master' into master
This commit is contained in:
commit
6b325708db
@ -105,18 +105,32 @@ setup_ttrss()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# If we've been passed $TTRSS_SELF_URL as an env variable, then use that,
|
# 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
|
if [ -z "$TTRSS_SELF_URL" ]; then
|
||||||
# Construct the final URL TTRSS will use.
|
# Construct the final URL TTRSS will use.
|
||||||
TTRSS_SELF_URL=${TTRSS_PROTO}://${TTRSS_URL}${TTRSS_PORT}/
|
TTRSS_SELF_URL=${TTRSS_PROTO}://${TTRSS_URL}${TTRSS_PORT}/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Setup: URL is: $TTRSS_SELF_URL"
|
echo "Setup: URL is: $TTRSS_SELF_URL"
|
||||||
|
|
||||||
# Patch URL path.
|
# Patch URL path.
|
||||||
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
|
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
|
||||||
|
|
||||||
# Enable additional system plugins: api_newsplus.
|
# Enable additional system plugins.
|
||||||
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', 'api_newsplus, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
|
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()
|
setup_db()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user