YunoHost-Apps/seafile_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/seafile_ynh.git synced 2024-09-03 20:26:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove dependance of mysql root password. Drop support of upgrade from 4.0 to 4.1

Browse source 
Linked to https://github.com/YunoHost/yunohost/pull/912
This commit is contained in:
Josué Tille 2020-04-13 15:24:46 +02:00
parent 27c3bbc1c3
commit a51b9a66f5
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
12 changed files with 15 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/expect_scripts/upgrade_4.1.1.exp
View file

@ -1,15 +0,0 @@
#!/usr/bin/expect
set timeout 5
set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_4.0_4.1.sh
expect "to contiune"
send "\r";
expect "What is the root password for mysql?"
send "$mysql_password\r";
interact

1
scripts/expect_scripts/upgrade_4.2.1.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_4.1_4.2.sh spawn $seafile_dir/upgrade/upgrade_4.1_4.2.sh

1
scripts/expect_scripts/upgrade_4.3.2.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_4.2_4.3.sh spawn $seafile_dir/upgrade/upgrade_4.2_4.3.sh

1
scripts/expect_scripts/upgrade_4.4.3.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_4.3_4.4.sh spawn $seafile_dir/upgrade/upgrade_4.3_4.4.sh

1
scripts/expect_scripts/upgrade_5.0.3.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_4.4_5.0.sh spawn $seafile_dir/upgrade/upgrade_4.4_5.0.sh

1
scripts/expect_scripts/upgrade_5.1.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_5.0_5.1.sh spawn $seafile_dir/upgrade/upgrade_5.0_5.1.sh

1
scripts/expect_scripts/upgrade_6.0.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_5.1_6.0.sh spawn $seafile_dir/upgrade/upgrade_5.1_6.0.sh

1
scripts/expect_scripts/upgrade_6.1.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_6.0_6.1.sh spawn $seafile_dir/upgrade/upgrade_6.0_6.1.sh

1
scripts/expect_scripts/upgrade_6.2.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_6.1_6.2.sh spawn $seafile_dir/upgrade/upgrade_6.1_6.2.sh

1
scripts/expect_scripts/upgrade_6.3.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_6.2_6.3.sh spawn $seafile_dir/upgrade/upgrade_6.2_6.3.sh

1
scripts/expect_scripts/upgrade_7.0.exp
View file

@ -2,7 +2,6 @@
set timeout 5 set timeout 5
set seafile_dir [lindex $argv 0] set seafile_dir [lindex $argv 0]
set mysql_password [lindex $argv 1]
spawn $seafile_dir/upgrade/upgrade_6.3_7.0.sh spawn $seafile_dir/upgrade/upgrade_6.3_7.0.sh

23
scripts/upgrade
View file

@ -23,7 +23,6 @@ installed_version=$(ynh_app_setting_get --app $app --key installed_version)
seahub_port=$(ynh_app_setting_get --app $app --key seahub_port) seahub_port=$(ynh_app_setting_get --app $app --key seahub_port)
fileserver_port=$(ynh_app_setting_get --app $app --key fileserver_port) fileserver_port=$(ynh_app_setting_get --app $app --key fileserver_port)
webdav_port=$(ynh_app_setting_get --app $app --key webdav_port) webdav_port=$(ynh_app_setting_get --app $app --key webdav_port)
root_pwd=$(cat /etc/yunohost/mysql)
final_path=$(ynh_app_setting_get --app $app --key final_path) final_path=$(ynh_app_setting_get --app $app --key final_path)
seafile_user=$app seafile_user=$app
@ -99,51 +98,51 @@ chmod +x $final_path/seafile-server-$seafile_version/upgrade/minor-upgrade.sh
case $installed_version in case $installed_version in
"4.0."* ) "4.0."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_4.1.1.exp $final_path/seafile-server-$seafile_version $root_pwd ynh_die "Upgrade form the version 4.0 was removed. Upgrade from this version won't be supported any more."
;& ;&
"4.1."* ) "4.1."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_4.2.1.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_4.2.1.exp $final_path/seafile-server-$seafile_version
;& ;&
"4.3."* ) "4.3."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_4.4.3.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_4.4.3.exp $final_path/seafile-server-$seafile_version
;& ;&
"4.4."* ) "4.4."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_5.0.3.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_5.0.3.exp $final_path/seafile-server-$seafile_version
;& ;&
"5.0."* ) "5.0."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_5.1.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_5.1.exp $final_path/seafile-server-$seafile_version
;& ;&
"5.1."* ) "5.1."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_6.0.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_6.0.exp $final_path/seafile-server-$seafile_version
;& ;&
"6.0."* ) "6.0."* )
python3 ../conf/update_sso_conf.py || true python3 ../conf/update_sso_conf.py || true
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_6.1.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_6.1.exp $final_path/seafile-server-$seafile_version
# Enable manually wiki # Enable manually wiki
echo 'ENABLE_WIKI = True' | tee -a $final_path/conf/seahub_settings.py echo 'ENABLE_WIKI = True' | tee -a $final_path/conf/seahub_settings.py
;& ;&
"6.1."* ) "6.1."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_6.2.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_6.2.exp $final_path/seafile-server-$seafile_version
;& ;&
"6.2."* ) "6.2."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_6.3.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_6.3.exp $final_path/seafile-server-$seafile_version
# Update logrotate to have the last version # Update logrotate to have the last version
ynh_use_logrotate --logfile $final_path/logs --nonappend ynh_use_logrotate --logfile $final_path/logs --nonappend
;& ;&
"6.3."* ) "6.3."* )
# Update seafile by script # Update seafile by script
expect_scripts/upgrade_7.0.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/upgrade_7.0.exp $final_path/seafile-server-$seafile_version
# SSO authentication # SSO authentication
echo 'ENABLE_REMOTE_USER_AUTHENTICATION = True' | tee -a $final_path/conf/seahub_settings.py echo 'ENABLE_REMOTE_USER_AUTHENTICATION = True' | tee -a $final_path/conf/seahub_settings.py
echo "REMOTE_USER_HEADER = 'HTTP_EMAIL'" | tee -a $final_path/conf/seahub_settings.py echo "REMOTE_USER_HEADER = 'HTTP_EMAIL'" | tee -a $final_path/conf/seahub_settings.py
@ -157,7 +156,7 @@ case $installed_version in
;& ;&
esac esac
expect_scripts/minor-upgrade.exp $final_path/seafile-server-$seafile_version $root_pwd expect_scripts/minor-upgrade.exp $final_path/seafile-server-$seafile_version
## Install webdav and logrotate if not installed ## Install webdav and logrotate if not installed
if [[ $installed_version = "4.0."* ]] || [[ $installed_version = "4.1."* ]] if [[ $installed_version = "4.0."* ]] || [[ $installed_version = "4.1."* ]]