diff --git a/README.md b/README.md index cbe74fa..02e26dd 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Shipped version:** 0.12.0~ynh1 +**Shipped version:** 0.12.0~ynh2 ## Disclaimers / important information :warning: The upstream app is still in beta. Tread carefully. diff --git a/README_fr.md b/README_fr.md index f2b43c3..3ce1f66 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Version incluse :** 0.12.0~ynh1 +**Version incluse :** 0.12.0~ynh2 ## Avertissements / informations importantes :warning: The upstream app is still in beta. Tread carefully. diff --git a/manifest.json b/manifest.json index e36662b..2889e14 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix homeserver of second generation", "fr": "Serveur Matrix de seconde génération" }, - "version": "0.12.0~ynh1", + "version": "0.12.0~ynh2", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/change_url b/scripts/change_url index 334bd88..cbd458f 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -89,7 +89,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -138,7 +138,7 @@ ynh_add_systemd_config ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/config b/scripts/config index 2ea3ea5..fac0561 100644 --- a/scripts/config +++ b/scripts/config @@ -46,7 +46,7 @@ ynh_app_config_apply() { ynh_add_config --template="../conf/dendrite.yaml" --destination="$final_path/dendrite.yaml" ynh_add_systemd_config - ynh_systemd_action --service_name=$app --action="restart" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/$app.log" + ynh_systemd_action --service_name=$app --action="restart" --line_match="Cleaning old notifications" --log_path="systemd" ynh_app_setting_set --app=$app --key=registration --value=$registration fi diff --git a/scripts/install b/scripts/install index fc0b274..caeac53 100644 --- a/scripts/install +++ b/scripts/install @@ -214,7 +214,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index d0196f8..298c2aa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -139,7 +139,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 022cbf0..a87957e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,7 +56,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="systemd" #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -222,7 +222,7 @@ yunohost service add $app --description="Dendrite Matrix homeserver" --log="/var #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --line_match="Starting external Monolith listener" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="start" --line_match="Cleaning old notifications" --log_path="systemd" #================================================= # RELOAD NGINX