From 6dffb41d9a4afe61fe8c6a6121ee8f4817cc16dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 20 Mar 2022 21:48:11 +0100 Subject: [PATCH] Testing (#104) * 4.5.0 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 16 ++++++++++------ scripts/_common.sh | 2 +- scripts/change_url | 4 ++-- scripts/install | 9 ++++----- scripts/remove | 2 +- scripts/restore | 6 +++--- scripts/upgrade | 13 ++++++------- 10 files changed, 31 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 0778eb8..9b862e6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Rocket.Chat is an open-source fully customizable communications platform developed in JavaScript for organizations with high standards of data protection. -**Shipped version:** 4.3.2~ynh1 +**Shipped version:** 4.5.0~ynh1 **Demo:** https://cloud.rocket.chat/trial diff --git a/README_fr.md b/README_fr.md index 3aa1614..51d3607 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Rocket.Chat est une plate-forme de communication open source entièrement personnalisable développée en JavaScript pour les organisations avec des normes élevées de protection des données. -**Version incluse :** 4.3.2~ynh1 +**Version incluse :** 4.5.0~ynh1 **Démo :** https://cloud.rocket.chat/trial diff --git a/conf/app.src b/conf/app.src index f182000..c77ab8b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.rocket.chat/4.3.2/download -SOURCE_SUM=b3861e26b8c36637fb2f77b6ba4e0de1c2fe290c50e05850b024ffac154c8753 +SOURCE_URL=https://releases.rocket.chat/4.5.0/download +SOURCE_SUM=d0eaf809a4659766a19dc841fa7f0bcad45bbc001040d091212c769b5367a007 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cb5d5b1..f943ec6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Team collaboration communication platform", "fr": "Plateforme de communication collaborative en équipe" }, - "version": "4.3.2~ynh1", + "version": "4.5.0~ynh1", "url": "https://rocket.chat", "upstream": { "license": "GPL-3.0", @@ -44,14 +44,18 @@ "name": "admin", "type": "user" }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, { "name": "password", "type": "password" + }, + { + "name": "is_public", + "type": "boolean", + "help": { + "en": "If enabled, RocketChat will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, RocketChat sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, + "default": true } ] } diff --git a/scripts/_common.sh b/scripts/_common.sh index bbf1cfe..3644475 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=12 +nodejs_version=14 # dependencies used by the app pkg_dependencies="apt-transport-https build-essential gzip curl fontconfig graphicsmagick" diff --git a/scripts/change_url b/scripts/change_url index 538ca2b..76b4138 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -108,7 +108,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 6deff82..b416a64 100644 --- a/scripts/install +++ b/scripts/install @@ -132,8 +132,7 @@ popd #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" ynh_add_systemd_config #================================================= @@ -175,15 +174,15 @@ ynh_script_progression --message="Starting a MongoDB service..." --weight=2 # Start a mongod service ynh_exec_warn_less systemctl enable $mongodb_servicename --quiet -ynh_systemd_action --service_name=$mongodb_servicename --action=restart +ynh_systemd_action --service_name=$mongodb_servicename --action="restart" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action=start --log_path=systemd -sleep 100 +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +sleep 60 #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 3e8bd12..8c4db16 100644 --- a/scripts/remove +++ b/scripts/remove @@ -86,7 +86,7 @@ fi #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index 67696c2..8162414 100644 --- a/scripts/restore +++ b/scripts/restore @@ -132,15 +132,15 @@ ynh_script_progression --message="Starting a MongoDB service..." --weight=2 # Start a mongod service ynh_exec_warn_less systemctl enable $mongodb_servicename --quiet -ynh_systemd_action --service_name=$mongodb_servicename --action=restart +ynh_systemd_action --service_name=$mongodb_servicename --action="restart" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=5 -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd -sleep 120 +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +sleep 60 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 2e10976..28e37e6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # CREATE DEDICATED USER @@ -130,8 +130,7 @@ popd #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config @@ -144,7 +143,7 @@ sed -i "s/^# engine:/ engine: wiredTiger/" /etc/mongod.conf sed -i "s/^#replication:/replication:\n replSetName: rs01/" /etc/mongod.conf ynh_exec_warn_less systemctl enable $mongodb_servicename --quiet -ynh_systemd_action --service_name=$mongodb_servicename --action=restart +ynh_systemd_action --service_name=$mongodb_servicename --action="restart" sleep 10 @@ -170,9 +169,9 @@ yunohost service add $app --description="Team collaboration communication platfo #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=10 -ynh_systemd_action --service_name=$mongodb_servicename --action=restart --log_path=systemd -ynh_systemd_action --service_name=$app --action=start --log_path=systemd -sleep 100 +ynh_systemd_action --service_name=$mongodb_servicename --action="restart" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +sleep 60 #================================================= # RELOAD NGINX