web/docker-ttrss
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes.

Browse Source
This commit is contained in:
x86dev 2015-09-15 22:38:26 +02:00
parent 64aa4f3e42
commit b52c2d45f2
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service-ttrss-update.conf
View File

@ -1,4 +1,6 @@
[program:ttrss-update] [program:ttrss-update]
command=/srv/update-ttrss.sh command=/srv/update-ttrss.sh --wait-exit 24h
user=root user=root
autorestart=true
exitcodes=0
redirect_stderr=true redirect_stderr=true

21
update-ttrss.sh
View File

@ -3,6 +3,10 @@ set -e
TTRSS_PATH=/var/www/ttrss TTRSS_PATH=/var/www/ttrss
# Note: Make sure to keep the actual updater service ("ttrss-update") alive,
# otherwise this script will be killed and everyting goes nuts.
TTRSS_SUPERVISORD_SERVICES="ttrss-daemon nginx php5-fpm"
update_ttrss() update_ttrss()
{ {
echo "Updating: Tiny Tiny RSS" echo "Updating: Tiny Tiny RSS"
@ -52,14 +56,25 @@ update_common()
echo "Update: Updating rolling release ..." echo "Update: Updating rolling release ..."
echo "Update: Stopping all ..." echo "Update: Stopping all ..."
supervisorctl stop all
supervisorctl stop ${TTRSS_SUPERVISORD_SERVICES}
update_ttrss update_ttrss
update_plugin_mobilize update_plugin_mobilize
update_plugin_newsplus update_plugin_newsplus
update_theme_feedly update_theme_feedly
update_common update_common
echo "Update: Done."
if [ "$1" != "--no-start" ]; then if [ "$1" != "--no-start" ]; then
echo "Update: Starting all ..." echo "Update: Starting all ..."
supervisorctl start all supervisorctl start ${TTRSS_SUPERVISORD_SERVICES}
fi
if [ "$1" = "--wait-exit" ]; then
UPDATE_WAIT_TIME=$2
if [ -z "$UPDATE_WAIT_TIME" ]; then
UPDATE_WAIT_TIME=24h # Default is to check every day (24 hours).
fi
echo "Update: Sleeping for $UPDATE_WAIT_TIME ..."
sleep ${UPDATE_WAIT_TIME}
fi fi
echo "Update: Done."