From 76b83da390a56c4d53251665c7fb8220e9a61589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 12 Sep 2023 18:21:19 +0200 Subject: [PATCH] common code --- scripts/_common.sh | 26 +++++++++++++++++++++++++- scripts/install | 13 +------------ scripts/upgrade | 13 +------------ 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 00c09fa..3c64eed 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,12 +7,36 @@ # dependencies used by the app pkg_dependencies="postgresql" -nodejs_version=14 +nodejs_version=18 #================================================= # PERSONAL HELPERS #================================================= +__ynh_register_synapse_app_service() { + $final_path/bin/matrix-appservice-irc -r \ + -c $final_path/config.yaml \ + -u "http://localhost:$port" \ + -f $final_path/appservice-registration-irc.yaml + + ynh_store_file_checksum --file=$final_path/appservice-registration-irc.yaml + + # This appservice needs it to be duplicated… + cp $final_path/appservice-registration-irc.yaml /etc/matrix-$synapse_instance/app-service/$app.yaml + + /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh \ + || ynh_die "Synapse can't restart with the appservice configuration" +} + +# TODO: +__ynh_register_dendrite_app_service() { + : +} + +__ynh_register_matrix_app_service() { + __ynh_register_synapse_app_service +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index f2ebff9..3764d7a 100755 --- a/scripts/install +++ b/scripts/install @@ -137,18 +137,7 @@ chown $app:$app "$final_path/passkey.pem" # REGISTER SYNAPSE APP-SERVICE #================================================= -$final_path/bin/matrix-appservice-irc -r \ - -c $final_path/config.yaml \ - -u "http://localhost:$port" \ - -f $final_path/appservice-registration-irc.yaml - -ynh_store_file_checksum --file=$final_path/appservice-registration-irc.yaml - -# This appservice needs it to be duplicated… -cp $final_path/appservice-registration-irc.yaml /etc/matrix-$synapse_instance/app-service/$app.yaml - -/opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh \ - || ynh_die "Synapse can't restart with the appservice configuration" +__ynh_register_matrix_app_service #================================================= # SETUP SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index dc89d07..5171118 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,18 +135,7 @@ chown $app:$app "$final_path/config.yaml" ynh_backup_if_checksum_is_different --file=$final_path/appservice-registration-irc.yaml -$final_path/bin/matrix-appservice-irc -r \ - -c $final_path/config.yaml \ - -u "http://localhost:$port" \ - -f $final_path/appservice-registration-irc.yaml - -ynh_store_file_checksum --file=$final_path/appservice-registration-irc.yaml - -# This appservice needs it to be duplicated… -cp $final_path/appservice-registration-irc.yaml /etc/matrix-$synapse_instance/app-service/$app.yaml - -/opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh \ - || ynh_die "Synapse can't restart with the appservice configuration" +__ynh_register_matrix_app_service #================================================= # SETUP SYSTEMD