diff --git a/conf/add_sso_conf.py b/conf/add_sso_conf.txt similarity index 100% rename from conf/add_sso_conf.py rename to conf/add_sso_conf.txt diff --git a/conf/remove_sso_conf.py b/conf/remove_sso_conf.txt similarity index 100% rename from conf/remove_sso_conf.py rename to conf/remove_sso_conf.txt diff --git a/scripts/install b/scripts/install index 0b9467f..5cbb329 100644 --- a/scripts/install +++ b/scripts/install @@ -123,12 +123,12 @@ ynh_replace_string "yourpassword" "$pass" "$final_path/user/config.php" ynh_replace_string "modify this text with something random" "$(ynh_string_random 24)$(ynh_string_random 24)" "$final_path/user/config.php" # The script "add_sso_conf.py" will just add en entry for the path "/admin" in the sso conf.json.persistent file in the cathegory "protected_urls". -cp ../conf/add_sso_conf.py $final_path -cp ../conf/remove_sso_conf.py $final_path -ynh_replace_string "__DOMAIN__" "$domain" "$final_path/user/add_sso_conf.py" -ynh_replace_string "__PATH__" "$path_url" "$final_path/user/add_sso_conf.py" -ynh_replace_string "__DOMAIN__" "$domain" "$final_path/user/remove_sso_conf.py" -ynh_replace_string "__PATH__" "$path_url" "$final_path/user/remove_sso_conf.py" +cp ../conf/add_sso_conf.py $final_path/add_sso_conf.py +cp ../conf/remove_sso_conf.py $final_path/remove_sso_conf.py +ynh_replace_string "__DOMAIN__" "$domain" "$final_path/add_sso_conf.py" +ynh_replace_string "__PATH__" "$path_url" "$final_path/add_sso_conf.py" +ynh_replace_string "__DOMAIN__" "$domain" "$final_path/remove_sso_conf.py" +ynh_replace_string "__PATH__" "$path_url" "$final_path/remove_sso_conf.py" python3 $final_path/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" diff --git a/scripts/upgrade b/scripts/upgrade index e8f9a41..1cf2449 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,10 +83,10 @@ sudo cp -a "$tmpdir/user/config.php" "$final_path/user" # The script "add_sso_conf.py" will just add en entry for the path "/admin" in the sso conf.json.persistent file in the cathegory "protected_urls". cp ../conf/add_sso_conf.py $final_path cp ../conf/remove_sso_conf.py $final_path -ynh_replace_string "__DOMAIN__" "$domain" "$final_path/user/add_sso_conf.py" -ynh_replace_string "__PATH__" "$path_url" "$final_path/user/add_sso_conf.py" -ynh_replace_string "__DOMAIN__" "$domain" "$final_path/user/remove_sso_conf.py" -ynh_replace_string "__PATH__" "$path_url" "$final_path/user/remove_sso_conf.py" +ynh_replace_string "__DOMAIN__" "$domain" "$final_path/add_sso_conf.py" +ynh_replace_string "__PATH__" "$path_url" "$final_path/add_sso_conf.py" +ynh_replace_string "__DOMAIN__" "$domain" "$final_path/remove_sso_conf.py" +ynh_replace_string "__PATH__" "$path_url" "$final_path/remove_sso_conf.py" #remove tmp dir sudo rm -Rf "$tmpdir"