diff --git a/check_process b/check_process index 88677ed..f2ac95c 100644 --- a/check_process +++ b/check_process @@ -4,16 +4,16 @@ domain="domain.tld" (DOMAIN) path="/path" (PATH) ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 + pkg_linter=0 + setup_sub_dir=0 + setup_root=0 setup_nourl=0 - setup_private=1 + setup_private=0 setup_public=0 - upgrade=1 - ; test upgrade from latest published version + upgrade=0 + # test upgrade from latest published version upgrade=1 from_commit=fd6350495d5a1d864ae30e1a61e18939fdb6a428 - ; test upgrade from latest git commit before Jibec's rewriting + # test upgrade from latest git commit before Jibec's rewriting upgrade=1 from_commit=267ccc21f7b52d22bc3d5b9cd6239857b9a82aad backup_restore=1 multi_instance=1 diff --git a/scripts/install b/scripts/install index 8643d2b..40a4bad 100644 --- a/scripts/install +++ b/scripts/install @@ -70,10 +70,8 @@ ynh_install_app_dependencies make python-dev python-virtualenv \ # Use 'FSyncMS' as database name and user db_user=$app db_name=$(ynh_sanitize_dbid $app) -db_pwd=$(ynh_string_random) ynh_app_setting_set "$app" db_name "$db_name" -ynh_app_setting_set "$app" db_pwd "$db_name" ynh_mysql_setup_db "$db_user" "$db_name" #================================================= @@ -182,6 +180,7 @@ yunohost service add "$app" -l /var/log/$app/$app.log # SETUP SSOWAT #================================================= +# accessible by everyone (authentification is done by firefox accounts) ynh_app_setting_set "$app" skipped_uris "/" #================================================= diff --git a/scripts/restore b/scripts/restore index b0b39d0..8a5251e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -59,7 +59,7 @@ ynh_restore_file "$final_path" # RESTORE THE MYSQL DATABASE #================================================= -db_pwd=$(ynh_app_setting_get "$app" db_pwd) +db_pwd=$(ynh_app_setting_get "$app" mysqlpwd) ynh_mysql_setup_db "$db_name" "$db_name" "$db_pwd" ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < ./db.sql diff --git a/scripts/upgrade b/scripts/upgrade index e5c00ed..6a5c81e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path_url) db_name=$(ynh_app_setting_get "$app" db_name) -db_pwd=$(ynh_app_setting_get "$app" db_pwd) +db_pwd=$(ynh_app_setting_get "$app" mysqlpwd) db_user=$app final_path=$(ynh_app_setting_get "$app" final_path) secret=$(ynh_app_setting_get "$app" secret) @@ -47,6 +47,18 @@ if [ -z "$final_path" ]; then ynh_app_setting_set "$app" final_path "$final_path" fi +# Detect old installation style +if [ -e /opt/yunohost/ffsync ]; then + service ffsync stop + update-rc.d -f ffsync remove + + ynh_secure_remove /etc/init.d/ffsync + ynh_secure_remove /var/log/ffsync.log + ynh_secure_remove /opt/yunohost/ffsync + + ynh_add_systemd_config +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -157,5 +169,6 @@ ynh_app_setting_set "$app" skipped_uris "/" # RELOAD NGINX #================================================= +systemctl stop "$app.service" systemctl start "$app.service" systemctl reload nginx