Integrated DB setup in setup-ttrss.sh, don't do an update in setup-ttrss.sh.
This commit is contained in:
parent
5ba3b49090
commit
1d6442f283
@ -112,11 +112,15 @@ setup_ttrss()
|
||||
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', 'api_newsplus, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
|
||||
}
|
||||
|
||||
echo "Setup: Installing Tiny Tiny RSS ..."
|
||||
setup_db()
|
||||
{
|
||||
echo "Setup: Database"
|
||||
php -f /srv/ttrss-configure-db.php
|
||||
php -f /srv/ttrss-configure-plugin-mobilize.php
|
||||
}
|
||||
|
||||
setup_nginx
|
||||
setup_ttrss
|
||||
|
||||
echo "Setup: Applying updates ..."
|
||||
/srv/update-ttrss.sh --no-start
|
||||
setup_db
|
||||
|
||||
echo "Setup: Done"
|
||||
|
||||
@ -12,12 +12,6 @@ update_ttrss()
|
||||
|
||||
echo "Updating: Tiny Tiny RSS"
|
||||
( cd ${TTRSS_PATH} && git pull origin HEAD )
|
||||
|
||||
if [ -n "$DB_PORT" ]; then
|
||||
echo "Updating: Database"
|
||||
php -f /srv/ttrss-configure-db.php
|
||||
php -f /srv/ttrss-configure-plugin-mobilize.php
|
||||
fi
|
||||
}
|
||||
|
||||
update_plugin_mobilize()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user