From 4707d632d67af5cd81dcbbfb8dc742286f36c17c Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Wed, 27 Jan 2021 16:18:17 +0100 Subject: [PATCH 1/2] add missing symbolic links to avatars and custom --- seahub/scripts/create_data_links.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/seahub/scripts/create_data_links.sh b/seahub/scripts/create_data_links.sh index 7566b65..0ae9016 100644 --- a/seahub/scripts/create_data_links.sh +++ b/seahub/scripts/create_data_links.sh @@ -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 \ No newline at end of file +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 \ No newline at end of file From 3d906489984fd6d1ef4fc8d3f00e9ac01fd8b075 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Wed, 27 Jan 2021 16:28:51 +0100 Subject: [PATCH 2/2] fix output of kill socat, increase waiting time for sigterm --- seafile-server/scripts/start.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/seafile-server/scripts/start.sh b/seafile-server/scripts/start.sh index 606b149..eeba876 100644 --- a/seafile-server/scripts/start.sh +++ b/seafile-server/scripts/start.sh @@ -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 {