From dcfdbc32017b906c1ad8a6165872db334aa571a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 May 2019 15:37:18 +0200 Subject: [PATCH 1/3] Use the sso script directly from the config directroy --- manifest.json | 4 ++-- scripts/install | 4 +--- scripts/remove | 2 +- scripts/restore | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 84829f7..52e4a55 100644 --- a/manifest.json +++ b/manifest.json @@ -3,13 +3,13 @@ "id": "synapse", "packaging_format": 1, "requirements": { - "yunohost": ">= 2.7.14" + "yunohost": ">= 3.5.0" }, "description": { "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.99.3~ynh1", + "version": "0.99.3~ynh2", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 1cf481b..795458c 100644 --- a/scripts/install +++ b/scripts/install @@ -313,9 +313,7 @@ ynh_replace_string __APP__ $app "$final_path/Coturn_config_rotate.sh" # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -cp ../conf/add_sso_conf.py $final_path -cp ../conf/remove_sso_conf.py $final_path -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" +python3 ../conf/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" #================================================= # SECURE FILES AND DIRECTORIES diff --git a/scripts/remove b/scripts/remove index 01dcc21..ccedf27 100755 --- a/scripts/remove +++ b/scripts/remove @@ -64,7 +64,7 @@ closeport $turnserver_alt_tls_port #================================================= # Remove the skipped url -python3 $final_path/remove_sso_conf.py +python3 ../conf/remove_sso_conf.py #================================================= # REMOVE DEPENDENCIES diff --git a/scripts/restore b/scripts/restore index 8b940dc..1a50a34 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,7 +148,7 @@ yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1 # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -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" +python3 ../settings/conf/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" #================================================= # RESTORE THE POSTGRESQL DATABASE From 741d520f551e4c47fd737289c34a334da75775f9 Mon Sep 17 00:00:00 2001 From: Josue-T Date: Sun, 12 May 2019 16:48:23 +0200 Subject: [PATCH 2/3] Fix typo Co-Authored-By: JimboJoe --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 795458c..0ce0279 100644 --- a/scripts/install +++ b/scripts/install @@ -313,7 +313,7 @@ ynh_replace_string __APP__ $app "$final_path/Coturn_config_rotate.sh" # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -python3 ../conf/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" +python3 ../conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent doesn't respect the json syntax. Please fix the syntax to install this app. For more information see here: https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # SECURE FILES AND DIRECTORIES From c36c8f066ca291fc68f5dd0beddfac880e53200f Mon Sep 17 00:00:00 2001 From: Josue-T Date: Sun, 12 May 2019 16:48:36 +0200 Subject: [PATCH 3/3] Fix typo Co-Authored-By: JimboJoe --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 1a50a34..de7c3ca 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,7 +148,7 @@ yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1 # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -python3 ../settings/conf/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" +python3 ../settings/conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent doesn't respect the json syntax. Please fix the syntax to install this app. For more information see here: https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # RESTORE THE POSTGRESQL DATABASE