From d6f6c88072978b17a65492ceefd82595237f17c8 Mon Sep 17 00:00:00 2001
From: sniper-py <dzmbbs@qq.com>
Date: Sat, 14 Dec 2019 15:11:34 +0800
Subject: [PATCH 1/3] rename_gunicorn_config in upgrade_7.0_7.1.sh

---
 scripts/upgrade/upgrade_7.0_7.1.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/upgrade/upgrade_7.0_7.1.sh b/scripts/upgrade/upgrade_7.0_7.1.sh
index 2f2b7bc..8074b9c 100755
--- a/scripts/upgrade/upgrade_7.0_7.1.sh
+++ b/scripts/upgrade/upgrade_7.0_7.1.sh
@@ -79,6 +79,22 @@ function read_seafile_data_dir () {
     export SEAFILE_CONF_DIR=$seafile_data_dir
 }
 
+function rename_gunicorn_config() {
+    echo
+    echo "renaming the gunicorn.conf to gunicon.conf.py ..."
+    echo
+    if [[ -f "${default_conf_dir}/gunicorn.conf" ]]; then
+        mv "${default_conf_dir}/gunicorn.conf" "${default_conf_dir}/gunicon.conf.py" 1>/dev/null
+    fi  
+
+    if [[ -f "${default_conf_dir}/gunicon.conf.py" ]]; then
+        echo 'Done'
+    else
+        echo "Failed to renamed the gunicorn.conf to gunicon.conf.py."
+        exit 1
+    fi  
+}
+
 function ensure_server_not_running() {
     # test whether seafile server has been stopped.
     if pgrep seaf-server 2>/dev/null 1>&2 ; then
@@ -125,6 +141,7 @@ function migrate_avatars() {
     echo "Done"
 }
 
+
 function update_database() {
     echo
     echo "Updating seafile/seahub database ..."
@@ -208,6 +225,7 @@ function move_old_customdir_outside() {
 
 check_python_executable;
 read_seafile_data_dir;
+rename_gunicorn_config;
 ensure_server_not_running;
 
 update_database;

From 570d8da4a3a4565a8ec40892f13fb761d1ab3998 Mon Sep 17 00:00:00 2001
From: sniper-py <dzmbbs@qq.com>
Date: Sat, 14 Dec 2019 15:15:07 +0800
Subject: [PATCH 2/3] rename_gunicorn_config in minor-upgrade.sh

---
 scripts/upgrade/minor-upgrade.sh | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/scripts/upgrade/minor-upgrade.sh b/scripts/upgrade/minor-upgrade.sh
index 987a60c..d8756f3 100755
--- a/scripts/upgrade/minor-upgrade.sh
+++ b/scripts/upgrade/minor-upgrade.sh
@@ -17,6 +17,8 @@ media_dir=${INSTALLPATH}/seahub/media
 orig_avatar_dir=${INSTALLPATH}/seahub/media/avatars
 dest_avatar_dir=${TOPDIR}/seahub-data/avatars
 seafile_server_symlink=${TOPDIR}/seafile-server-latest
+default_conf_dir=${TOPDIR}/conf
+default_ccnet_conf_dir=${TOPDIR}/ccnet
 seahub_data_dir=${TOPDIR}/seahub-data
 elasticsearch_config_file=${seafile_server_symlink}/pro/elasticsearch/config/jvm.options
 
@@ -113,6 +115,44 @@ function move_old_elasticsearch_config_to_latest() {
     fi
 }
 
+function read_seafile_data_dir() {
+    seafile_ini=${default_ccnet_conf_dir}/seafile.ini
+    if [[ -f ${seafile_ini} ]]; then
+        seafile_data_dir=$(cat "${seafile_ini}")
+        if [[ ! -d ${seafile_data_dir} ]]; then
+            echo "Your seafile server data directory \"${seafile_data_dir}\" is invalid or doesn't exits."
+            echo "Please check it first, or create this directory yourself."
+            echo ""
+            exit 1;
+        else
+            if [[ ${seafile_data_dir} != ${TOPDIR}/seafile-data ]]; then
+                if [[ ! -L ${TOPDIR}/seafile-data ]]; then
+                    ln -s ${seafile_data_dir} ${TOPDIR}/seafile-data
+                    echo "Created the symlink ${TOPDIR}/seafile-data for ${seafile_data_dir}."
+                fi  
+            fi  
+        fi
+    fi
+}
+
+function rename_gunicorn_config() {
+    echo
+    echo "renaming the gunicorn.conf to gunicon.conf.py ..."
+    echo
+    if [[ -f "${default_conf_dir}/gunicorn.conf" ]]; then
+        mv "${default_conf_dir}/gunicorn.conf" "${default_conf_dir}/gunicon.conf.py" 1>/dev/null
+    fi
+
+    if [[ -f "${default_conf_dir}/gunicon.conf.py" ]]; then
+        echo 'Done'
+    else
+        echo "Failed to renamed the gunicorn.conf to gunicon.conf.py."
+        exit 1
+    fi
+}
+ 
+read_seafile_data_dir;
+rename_gunicorn_config;
 migrate_avatars;
 
 move_old_customdir_outside;

From ad40c31916b14c23acf9ff343017db757feafa7c Mon Sep 17 00:00:00 2001
From: sniper-py <dzmbbs@qq.com>
Date: Sat, 14 Dec 2019 15:19:02 +0800
Subject: [PATCH 3/3] fix

---
 scripts/upgrade/upgrade_7.0_7.1.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade/upgrade_7.0_7.1.sh b/scripts/upgrade/upgrade_7.0_7.1.sh
index 8074b9c..15886c6 100755
--- a/scripts/upgrade/upgrade_7.0_7.1.sh
+++ b/scripts/upgrade/upgrade_7.0_7.1.sh
@@ -141,7 +141,6 @@ function migrate_avatars() {
     echo "Done"
 }
 
-
 function update_database() {
     echo
     echo "Updating seafile/seahub database ..."