diff --git a/scripts/change_url b/scripts/change_url index 5726416..f05d735 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,11 +31,7 @@ ynh_change_url_nginx_config # Retarget worker nodes #================================================= -set +o nounset -source "${install_dir}/venv/bin/activate" -set -o nounset -ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH SYNC_TOKENSERVER__DATABASE_URL="mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" $install_dir/venv/bin/python tools/tokenserver/remove_node.py "https://$old_domain$old_path" -ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH SYNC_TOKENSERVER__DATABASE_URL="mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" $install_dir/venv/bin/python tools/tokenserver/add_node.py "https://$new_domain$new_path" 10 +ynh_mysql_execute_as_root --sql="UPDATE nodes set node='https://$new_domain$new_path' node url='https://$old_domain$old_path'" --database="$db_name_tokenserver"; #================================================= # GENERIC FINALISATION diff --git a/scripts/upgrade b/scripts/upgrade index 1292f48..f602693 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,10 +73,6 @@ ynh_exec_as $app python -m venv "${install_dir}/venv" # tokenserver db diesel --database-url "mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" migration --migration-dir tokenserver-db/migrations run - - ynh_mysql_execute_as_root --sql="INSERT INTO services (id, service, pattern) VALUES (1, 'sync-1.5', '{node}/1.5/{uid}')" --database="$db_name_tokenserver"; - - ynh_exec_warn_less ynh_exec_as $app env PATH=$PATH SYNC_TOKENSERVER__DATABASE_URL="mysql://$db_user:${db_pwd}@localhost/$db_name_tokenserver" $install_dir/venv/bin/python tools/tokenserver/add_node.py "https://$domain$path_url" 10 popd )