diff --git a/README.md b/README.md index 82b0fda..35d0b55 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo - HTTP Invites - Alias management -**Shipped version:** 2.0.6~ynh1 +**Shipped version:** 2.0.6~ynh2 **Demo:** https://hermies.club/ diff --git a/README_fr.md b/README_fr.md index 9e734c0..768c6f4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ For a comprehensive introduction to rooms 2.0, watch [this video](https://www.yo - HTTP Invites - Alias management -**Version incluse :** 2.0.6~ynh1 +**Version incluse :** 2.0.6~ynh2 **Démo :** https://hermies.club/ diff --git a/check_process b/check_process index fefa192..bfdd5c8 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,3 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" @@ -11,24 +6,16 @@ language="fr" is_public=1 password="1Strong-Password" + ssb_admin_id="@5Pt3dKy2HTJ0mWuS78oIiklIX0gBz6BTfEnXsbvke9c=.ed25519" port="666" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/manifest.json b/manifest.json index 1645ac3..1598135 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Secure Scuttlebutt room server implemented in Go" }, - "version": "2.0.6~ynh1", + "version": "2.0.6~ynh2", "url": "https://github.com/ssb-ngi-pointer/go-ssb-room", "upstream": { "license": "free", diff --git a/scripts/change_url b/scripts/change_url index a5c36d2..ac0de97 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -98,6 +98,9 @@ then mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + # replace domain in systemd service file + ynh_replace_string --match_string=$old_domain --replace_string=$new_domain --target_file=/etc/systemd/system/$app.service + systemctl daemon-reload fi #================================================= diff --git a/scripts/install b/scripts/install index a22a1b1..e3b69d2 100755 --- a/scripts/install +++ b/scripts/install @@ -27,9 +27,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -#ssb_admin_id=$YNH_APP_ARG_SSB_ADMIN_ID -# workaround for CI test -ssb_admin_id="@5Pt3dKy2HTJ0mWuS78oIiklIX0gBz6BTfEnXsbvke9c=.ed25519" +ssb_admin_id=$YNH_APP_ARG_SSB_ADMIN_ID password=$YNH_APP_ARG_PASSWORD architecture=$(ynh_detect_arch) app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index dae1d83..7dd5e3c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -135,7 +135,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap #================================================= # GENERIC FINALIZATION #================================================= -# RELOAD NGINX AND PHP-FPM +# RELOAD NGINX #================================================= ynh_script_progression --message="Reloading NGINX web server" --weight=1 diff --git a/scripts/upgrade b/scripts/upgrade index a863f94..3ac60ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) ssb_admin_id=$(ynh_app_setting_get --app=$app --key=ssb_admin_id) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) port=$(ynh_app_setting_get --app=$app --key=port) ssbport=$(ynh_app_setting_get --app=$app --key=ssbport) architecture=$(ynh_detect_arch)