diff --git a/scripts/upgrade/sql/13.0.0/mysql/seafile.sql b/scripts/upgrade/sql/13.0.0/mysql/seafile.sql new file mode 100644 index 0000000000..882a7ab0b0 --- /dev/null +++ b/scripts/upgrade/sql/13.0.0/mysql/seafile.sql @@ -0,0 +1,3 @@ +ALTER TABLE EmailUser ADD COLUMN `is_department_owner` BOOL NOT NULL DEFAULT 0; +CREATE INDEX EmailUser_is_active on EmailUser(is_active); +CREATE INDEX EmailUser_is_department_owenr on EmailUser(is_department_owner); diff --git a/scripts/upgrade/sql/13.0.0/mysql/seahub.sql b/scripts/upgrade/sql/13.0.0/mysql/seahub.sql new file mode 100644 index 0000000000..147f7b3f25 --- /dev/null +++ b/scripts/upgrade/sql/13.0.0/mysql/seahub.sql @@ -0,0 +1,46 @@ +CREATE TABLE IF NOT EXISTS `repo_extra_config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `repo_id` varchar(36) NOT NULL, + `config_type` varchar(50) NOT NULL, + `config_details` longtext DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `ix_repo_extra_repo_id` (`repo_id`), + UNIQUE KEY `ix_repo_extra_repo_idconfig_type` (`repo_id`, `config_type`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE IF NOT EXISTS `RepoTransfer` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `repo_id` varchar(36) NOT NULL, + `org_id` int(11) NOT NULL, + `from_user` varchar(255) NOT NULL, + `to` varchar(255) NOT NULL, + `timestamp` datetime NOT NULL, + `operator` varchar(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `idx_file_transfer_org_id` (`org_id`), + KEY `idx_file_transfer_timestamp` (`timestamp`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE IF NOT EXISTS `group_invite_link` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `token` varchar(40) NOT NULL, + `group_id` int(11) NOT NULL, + `created_at` datetime(6) NOT NULL, + `created_by` varchar(255) NOT NULL, + PRIMARY KEY (`id`), + KEY `group_invite_link_group_id` (`group_id`), + KEY `group_invite_link_token` (`token`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE IF NOT EXISTS `org_last_active_time` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `org_id` int(11) NOT NULL, + `timestamp` datetime(6) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `org_id` (`org_id`), + KEY `ix_org_last_active_time_org_id` (`org_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +ALTER TABLE `sdoc_notification` ADD INDEX `idx_user_seen` (`username`, `seen`); + +ALTER TABLE organizations_orgsettings ADD COLUMN `is_active` tinyint(1) NOT NULL DEFAULT 1; diff --git a/scripts/upgrade/upgrade_12.0_13.0.sh b/scripts/upgrade/upgrade_12.0_13.0.sh new file mode 100755 index 0000000000..4c114c9b53 --- /dev/null +++ b/scripts/upgrade/upgrade_12.0_13.0.sh @@ -0,0 +1,212 @@ +#!/bin/bash + +SCRIPT=$(readlink -f "$0") # haiwen/seafile-server-1.3.0/upgrade/upgrade_xx_xx.sh +UPGRADE_DIR=$(dirname "$SCRIPT") # haiwen/seafile-server-1.3.0/upgrade/ +INSTALLPATH=$(dirname "$UPGRADE_DIR") # haiwen/seafile-server-1.3.0/ +TOPDIR=$(dirname "${INSTALLPATH}") # haiwen/ +default_ccnet_conf_dir=${TOPDIR}/ccnet +default_conf_dir=${TOPDIR}/conf +default_pids_dir=${TOPDIR}/pids +default_logs_dir=${TOPDIR}/logs +default_seafile_data_dir=${TOPDIR}/seafile-data +seafile_server_symlink=${TOPDIR}/seafile-server-latest +seahub_data_dir=${TOPDIR}/seahub-data + +manage_py=${INSTALLPATH}/seahub/manage.py + +export CCNET_CONF_DIR=${default_ccnet_conf_dir} +export SEAFILE_CONF_DIR=${default_seafile_data_dir} +export SEAFILE_CENTRAL_CONF_DIR=${default_conf_dir} +export PYTHONPATH=${INSTALLPATH}/seafile/lib/python3/site-packages:${INSTALLPATH}/seafile/lib64/python3/site-packages:${INSTALLPATH}/seahub:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH +export SEAFILE_LD_LIBRARY_PATH=${INSTALLPATH}/seafile/lib/:${INSTALLPATH}/seafile/lib64:${LD_LIBRARY_PATH} + +prev_version=12.0 +current_version=13.0 + +echo +echo "-------------------------------------------------------------" +echo "This script would upgrade your seafile server from ${prev_version} to ${current_version}" +echo "Press [ENTER] to contiune" +echo "-------------------------------------------------------------" +echo +read dummy + +function check_python_executable() { + if [[ "$PYTHON" != "" && -x $PYTHON ]]; then + return 0 + fi + + if which python3 2>/dev/null 1>&2; then + PYTHON=python3 + elif !(python --version 2>&1 | grep "3\.[0-9]\.[0-9]") 2>/dev/null 1>&2; then + echo + echo "The current version of python is not 3.x.x, please use Python 3.x.x ." + echo + exit 1 + else + PYTHON="python"$(python --version | cut -b 8-20) + if !which $PYTHON 2>/dev/null 1>&2; then + echo + echo "Can't find a python executable of $PYTHON in PATH" + echo "Install $PYTHON before continue." + echo "Or if you installed it in a non-standard PATH, set the PYTHON enviroment variable to it" + echo + exit 1 + fi + fi +} + +function check_seafile_data_dir () { + if [[ ! -d ${default_seafile_data_dir} ]]; then + echo "Your seafile server data directory \"${default_seafile_data_dir}\" is invalid or doesn't exits." + echo "Please check it first, or create this directory yourself." + echo "" + 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 + echo + echo "seafile server is still running !" + echo "stop it using scripts before upgrade." + echo + exit 1 + elif pgrep -f "${manage_py} run_gunicorn" 2>/dev/null 1>&2 \ + || pgrep -f "seahub.wsgi:application" 2>/dev/null 1>&2; then + echo + echo "seahub server is still running !" + echo "stop it before upgrade." + echo + exit 1 + elif pgrep -f "${manage_py} runfcgi" 2>/dev/null 1>&2 ; then + echo + echo "seahub server is still running !" + echo "stop it before upgrade." + echo + exit 1 + fi +} + +function migrate_avatars() { + echo + echo "migrating avatars ..." + echo + media_dir=${INSTALLPATH}/seahub/media + orig_avatar_dir=${INSTALLPATH}/seahub/media/avatars + dest_avatar_dir=${TOPDIR}/seahub-data/avatars + + # move "media/avatars" directory outside + if [[ ! -d ${dest_avatar_dir} ]]; then + mkdir -p "${TOPDIR}/seahub-data" + mv "${orig_avatar_dir}" "${dest_avatar_dir}" 2>/dev/null 1>&2 + ln -s ../../../seahub-data/avatars "${media_dir}" + + elif [[ ! -L ${orig_avatar_dir} ]]; then + mv "${orig_avatar_dir}"/* "${dest_avatar_dir}" 2>/dev/null 1>&2 + rm -rf "${orig_avatar_dir}" + ln -s ../../../seahub-data/avatars "${media_dir}" + fi + echo "Done" +} + +function update_database() { + echo + echo "Updating seafile/seahub database ..." + echo + + db_update_helper=${UPGRADE_DIR}/db_update_helper.py + if ! $PYTHON "${db_update_helper}" 13.0.0; then + echo + echo "Failed to upgrade your database" + echo + exit 1 + fi + echo "Done" +} + +function upgrade_seafile_server_latest_symlink() { + # update the symlink seafile-server to the new server version + if [[ -L "${seafile_server_symlink}" || ! -e "${seafile_server_symlink}" ]]; then + echo + printf "updating \033[33m${seafile_server_symlink}\033[m symbolic link to \033[33m${INSTALLPATH}\033[m ...\n\n" + echo + if ! rm -f "${seafile_server_symlink}"; then + echo "Failed to remove ${seafile_server_symlink}" + echo + exit 1; + fi + + if ! ln -s "$(basename ${INSTALLPATH})" "${seafile_server_symlink}"; then + echo "Failed to update ${seafile_server_symlink} symbolic link." + echo + exit 1; + fi + fi +} + +function make_media_custom_symlink() { + media_symlink=${INSTALLPATH}/seahub/media/custom + if [[ -L "${media_symlink}" ]]; then + return + + elif [[ ! -e "${media_symlink}" ]]; then + ln -s ../../../seahub-data/custom "${media_symlink}" + return + + + elif [[ -d "${media_symlink}" ]]; then + cp -rf "${media_symlink}" "${seahub_data_dir}/" + rm -rf "${media_symlink}" + ln -s ../../../seahub-data/custom "${media_symlink}" + fi + +} + +function move_old_customdir_outside() { + # find the path of the latest seafile server folder + if [[ -L ${seafile_server_symlink} ]]; then + latest_server=$(readlink -f "${seafile_server_symlink}") + else + return + fi + + old_customdir=${latest_server}/seahub/media/custom + + # old customdir is already a symlink, do nothing + if [[ -L "${old_customdir}" ]]; then + return + fi + + # old customdir does not exist, do nothing + if [[ ! -e "${old_customdir}" ]]; then + return + fi + + # media/custom exist and is not a symlink + cp -rf "${old_customdir}" "${seahub_data_dir}/" +} + + +################# +# The main execution flow of the script +################ + +check_python_executable; +check_seafile_data_dir; +ensure_server_not_running; + +update_database; +migrate_avatars; + +move_old_customdir_outside; +make_media_custom_symlink; +upgrade_seafile_server_latest_symlink; + + +echo +echo "-----------------------------------------------------------------" +echo "Upgraded your seafile server successfully." +echo "-----------------------------------------------------------------" +echo diff --git a/sql/mysql.sql b/sql/mysql.sql index cdb0371507..dd487eaf79 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -617,6 +617,7 @@ CREATE TABLE `organizations_orgsettings` ( `id` int(11) NOT NULL AUTO_INCREMENT, `org_id` int(11) NOT NULL, `role` varchar(100) DEFAULT NULL, + `is_active` tinyint(1) NOT NULL DEFAULT 1, PRIMARY KEY (`id`), UNIQUE KEY `organizations_orgsettings_org_id_630f6843_uniq` (`org_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -1465,7 +1466,8 @@ CREATE TABLE `sdoc_notification` ( `seen` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `sdoc_notification_doc_uuid_username` (`doc_uuid`, `username`), - KEY `sdoc_notification_created_at` (`created_at`) + KEY `sdoc_notification_created_at` (`created_at`), + KEY `idx_user_seen` (`username`, `seen`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE `base_clientssotoken` ( @@ -1599,3 +1601,22 @@ CREATE TABLE `group_invite_link` ( KEY `group_invite_link_group_id` (`group_id`), KEY `group_invite_link_token` (`token`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE `repo_extra_config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `repo_id` varchar(36) NOT NULL, + `config_type` varchar(50) NOT NULL, + `config_details` longtext DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `ix_repo_extra_repo_id` (`repo_id`), + UNIQUE KEY `ix_repo_extra_repo_idconfig_type` (`repo_id`, `config_type`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + +CREATE TABLE `org_last_active_time` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `org_id` int(11) NOT NULL, + `timestamp` datetime(6) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `org_id` (`org_id`), + KEY `ix_org_last_active_time_org_id` (`org_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;