From 8200283f69c26e69b39988b415720c52807bf3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Jun 2022 09:13:36 +0200 Subject: [PATCH] Testing (#121) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add doctl test files * Fix nodejs installation * Improve droplet create * Improve droplet create * Improve droplet create * Modify pkgchk config * Modify pkgchk config * Add testconfig again * Use new helpers and restrict arch * Upgrade test setup * Add selamanses key * Add fingerprint as key id * Use prebuilt image * Remove variables in app.src * Add cleanup cmds * Fix upgrade * Remove apt-key warning * Revert travis * Revert apt-key setting and restore modifications (#70) * Fix linter issues * Fix linter issues * Fix ynh_replace_string arguments * Update README.md * Enh testing (#77) * Make it work again (#71) * Auto-update README * Fix linter * Fix * Fix * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update systemd.service * Update install * Update install * Update install * Fix * 3.16.2 * Auto-update README * Update install * Update install * Update install * fix * Update install * Update install * Update install * Update systemd.service * Update install * Update install * Fix * Update install * Update install * Update systemd.service * Update systemd.service * Update install * Fix * Update systemd.service * Fix * Auto-update README * Fix * Update systemd.service * Update install * 4.1.2 * Auto-update README * Add logrotate * Update install * Add templates * Fix * Update upgrade * Fix * Fix * Fix * Fix * Fix * Add description * Auto-update README * fix * Fix * Fix * Set admin (#85) * Add admin * Delete updater.yml * 4.2.0 * Auto-update README * Update install * Update check_process * 4.2.1 (#90) * 4.2.1 * 4.2.2 (#93) * 4.2.2 * 4.3.0 (#96) * 4.3.0 * 4.3.1 (#99) * fix * Update app.src * Auto-update README Co-authored-by: Yunohost-Bot <> * Fédération * Auto-update README * Update manifest.json * Auto-update README * 4.3.2 (#101) * 4.3.2 * Update _common.sh * 4.4.0 (#103) * 4.4.0 * Auto-update README Co-authored-by: Yunohost-Bot <> * Fix linter * 4.5.0 * Auto-update README * Update manifest.json * 4.5.3 * Auto-update README * Update remove (#106) * 4.5.4 * Auto-update README * Auto-update README * 4.5.5 * Auto-update README * 4.6.0 * Auto-update README * 4.6.1 * Auto-update README * 4.6.2 * Auto-update README * 4.6.3 * Auto-update README * Update install * Update install * 4.7.0 * Auto-update README * 4.7.1 (#114) * 4.7.1 * Auto-update README * Update app.src Co-authored-by: yunohost-bot * 4.7.2 (#116) * 4.7.2 * Auto-update README * Update app.src Co-authored-by: yunohost-bot * Auto-update README * Update app.src * Update manifest.json * Auto-update README * 4.7.4 * Auto-update README * Matrix (#120) * Update nginx.conf * 4.8.0 * Auto-update README Co-authored-by: yunohost-bot * 4.8.1 * Auto-update README * remove env_path * Update check_process Co-authored-by: Selamanse Co-authored-by: Selamanse Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- check_process | 7 ++++--- conf/app.src | 4 ++-- conf/nginx.conf | 16 ++++++++++++---- conf/systemd.service | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- scripts/upgrade | 1 - 9 files changed, 24 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 0abb410..de3ad6c 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.7.2~ynh2 +**Shipped version:** 4.8.1~ynh1 **Demo:** https://cloud.rocket.chat/trial diff --git a/README_fr.md b/README_fr.md index 6dcfb90..65bfe3f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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.7.2~ynh2 +**Version incluse :** 4.8.1~ynh1 **Démo :** https://cloud.rocket.chat/trial diff --git a/check_process b/check_process index f767028..bdf0be3 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=f565c082fa1b839326433ad149e32223f7447eec + #4.7.2~ynh2 + upgrade=1 from_commit=9280c034e8843e7e69622f0daa02ee74c916faa1 backup_restore=1 multi_instance=1 change_url=1 @@ -21,7 +22,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=f565c082fa1b839326433ad149e32223f7447eec - name=Testing (#86) + ; commit=9280c034e8843e7e69622f0daa02ee74c916faa1 + name=Testing (#118) manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&password=pass&port=666& \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 2ca52e9..86ed495 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.rocket.chat/4.7.2/download -SOURCE_SUM=5d4efecc112932d7214cb0ffbf74531cb778a4d5d17764e6dd42d2de6137e6b2 +SOURCE_URL=https://releases.rocket.chat/4.8.1/download +SOURCE_SUM=8f4d16858e5ac4ef0a92b9ac0a9d30172e3ce80a1f598597cd5b714c36db4a27 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index e5ac8f3..c187424 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,8 +12,16 @@ location ^~ __PATH__/ { proxy_http_version 1.1; proxy_set_header Connection "upgrade"; proxy_set_header Upgrade $http_upgrade; - - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; - more_clear_input_headers 'Accept-Encoding'; } + +#https://geekgonecrazy.com/2022/05/30/rocketchat-and-the-matrix-protocol/ +location /.well-known/matrix/ { + + proxy_pass http://127.0.0.1:8008; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; +} \ No newline at end of file diff --git a/conf/systemd.service b/conf/systemd.service index 1e5b3bb..2767e22 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,9 +6,9 @@ After=network.target remote-fs.target nss-lookup.target nginx.service __MONGODB_ [Service] User=__APP__ Group=__APP__ -WorkingDirectory=__FINALPATH__ -Environment="PATH=__ENV_PATH__" Environment="NODE_ENV=production" +WorkingDirectory=__FINALPATH__/ +Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__YNH_NODE__ __FINALPATH__/main.js StandardOutput=syslog StandardError=syslog diff --git a/manifest.json b/manifest.json index c6c0c0f..a7916c4 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.7.2~ynh2", + "version": "4.8.1~ynh1", "url": "https://rocket.chat", "upstream": { "license": "GPL-3.0", diff --git a/scripts/install b/scripts/install index 36b4392..de4b421 100644 --- a/scripts/install +++ b/scripts/install @@ -132,7 +132,7 @@ popd #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -env_path="$PATH" +# Create a dedicated systemd config ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 28e37e6..5c20a5b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,7 +130,6 @@ popd #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 -env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config