Merge branch 'avatars'

This commit is contained in:
Gerrit Gogel 2021-01-27 16:29:18 +01:00
commit 8c886cd896
2 changed files with 9 additions and 6 deletions

View file

@ -26,11 +26,9 @@ function start_socat {
function stop_socat {
echo "Stopping socat..."
ps aux | grep '[s]ocat' | awk '{print $2}' | xargs kill -15 > /dev/null
sleep 2
if [ -z $(ps aux | grep '[s]ocat')]; then
ps aux | grep '[s]ocat' | awk '{print $2}' | xargs kill -9 > /dev/null
fi
ps aux | grep '[s]ocat' | awk '{print $2}' | xargs kill -15 |& tee /dev/null
sleep 5
ps aux | grep '[s]ocat' | awk '{print $2}' | xargs kill -9 |& tee /dev/null
}
function keep_running {

View file

@ -39,4 +39,9 @@ if [[ ! -e /shared/seafile/conf/seahub.conf ]]; then
fi
rm -f /opt/seafile/seafile-server-latest/runtime/seahub.conf
ln -sf /shared/seafile/conf/seahub.conf /opt/seafile/seafile-server-latest/runtime/seahub.conf
ln -sf /shared/seafile/conf/seahub.conf /opt/seafile/seafile-server-latest/runtime/seahub.conf
ln -sf /shared/seafile/seahub-data /opt/seafile/seafile-server-latest/seahub-data
rm -rf /opt/seafile/seafile-server-latest/seahub/media/avatars
rm -rf /opt/seafile/seafile-server-latest/seahub/media/custom
ln -sf /shared/seafile/seahub-data/avatars /opt/seafile/seafile-server-latest/seahub/media
ln -sf /shared/seafile/seahub-data/custom /opt/seafile/seafile-server-latest/seahub/media