From b405cac006e86e3f8b6477798ecd8a1d91e9553d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:37:04 +0200 Subject: [PATCH 01/13] 0.3.1 --- conf/app.src | 4 ++-- manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index b312f32..b219441 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/hydrogen-web/releases/download/v0.2.33/hydrogen-web-0.2.33.tar.gz -SOURCE_SUM=435698777ae431c963f7541fcdf4ebdfdb902c82c45e27ac3077efc8ddcd1e21 +SOURCE_URL=https://github.com/vector-im/hydrogen-web/releases/download/v0.3.1/hydrogen-web-0.3.1.tar.gz +SOURCE_SUM=b84b2fc982faf116c3cd021dfd520621f426122e728a71ab3835f29db7a2b325 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 35fe9cb..4891316 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "0.2.33~ynh1", + "version": "0.3.1~ynh1", "url": "https://matrix.org/docs/projects/client/hydrogen", "upstream": { "license": "Apache-2.0", @@ -20,7 +20,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ From 4b6b32a5b8ca751a5461b1998e6b19a2cd55d694 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 13:37:07 +0000 Subject: [PATCH 02/13] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ca2170a..227941a 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and **Shipped version:** 0.2.33~ynh1 + **Demo:** https://hydrogen.element.io/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2abeece..54fb88e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,8 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Version incluse :** 0.2.33~ynh1 +**Version incluse :** 0.2.33~ynh1 + **Démo :** https://hydrogen.element.io/ From bc3d28fb970c2118951a6cd27c72cdfbdbe600c3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 13:37:15 +0000 Subject: [PATCH 03/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 227941a..ed51c99 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Shipped version:** 0.2.33~ynh1 +**Shipped version:** 0.3.1~ynh1 **Demo:** https://hydrogen.element.io/ diff --git a/README_fr.md b/README_fr.md index 54fb88e..e80fffd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Version incluse :** 0.2.33~ynh1 +**Version incluse :** 0.3.1~ynh1 **Démo :** https://hydrogen.element.io/ From a2061c6be379fe3f7d4e34367530b451172211ab Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Aug 2022 13:37:50 +0000 Subject: [PATCH 04/13] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8ec8bf6..ed51c99 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ A minimal Matrix chat client, focused on performance, offline functionality, and **Shipped version:** 0.3.1~ynh1 - **Demo:** https://hydrogen.element.io/ ## Screenshots From fbd93592ebcc7d1841526cf3deb7bcb75ac85a39 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:41:53 +0200 Subject: [PATCH 05/13] Update config.sample.json --- conf/config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.sample.json b/conf/config.sample.json index 7c9d024..490fc5d 100644 --- a/conf/config.sample.json +++ b/conf/config.sample.json @@ -7,7 +7,7 @@ "defaultHomeServer": "https://__DEFAULT_SERVER__", "bugReportEndpointUrl": "https://element.io/bugreports/submit", "themeManifests": [ - "assets/theme-Element.json" + "assets/theme-element.json" ], "defaultTheme": { "light": "element-light", From da5ae88f96c40f3209db6d18fd73785ba867031b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:54:49 +0200 Subject: [PATCH 06/13] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index afae0ed..1be9f89 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,10 +3,10 @@ location __PATH__/ { alias __FINALPATH__/; + index index.html; + more_set_headers "X-Frame-Options: SAMEORIGIN"; more_set_headers "X-Content-Type-Options: nosniff"; more_set_headers "X-XSS-Protection: 1; mode=block"; more_set_headers "Content-Security-Policy: frame-ancestors 'none'"; - - index index.html; } From d226dbd4e8ba37d66e87c6dd7f6a805c74158103 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:57:03 +0200 Subject: [PATCH 07/13] Update nginx.conf --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1be9f89..8c3aca6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,9 +4,4 @@ location __PATH__/ { alias __FINALPATH__/; index index.html; - - more_set_headers "X-Frame-Options: SAMEORIGIN"; - more_set_headers "X-Content-Type-Options: nosniff"; - more_set_headers "X-XSS-Protection: 1; mode=block"; - more_set_headers "Content-Security-Policy: frame-ancestors 'none'"; } From 5723419a519320f1f5e68eecb32c86abf24fed48 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 15:59:52 +0200 Subject: [PATCH 08/13] Fix --- manifest.json | 5 +++++ scripts/upgrade | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/manifest.json b/manifest.json index 4891316..6a42fb3 100644 --- a/manifest.json +++ b/manifest.json @@ -38,6 +38,11 @@ "example": "/hydrogen", "default": "/hydrogen" }, + { + "name": "is_public", + "type": "boolean", + "default": true + }, { "name": "default_server", "type": "string", diff --git a/scripts/upgrade b/scripts/upgrade index ca6851a..b9f889e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,6 +92,19 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Configuring permissions..." --time --weight=1 + +# Make app public if necessary +if [ $is_public -eq 1 ] +then + # Everyone can access the app. + # The "main" permission is automatically created before the install script. + ynh_permission_update --permission="main" --add="visitors" +fi + #================================================= # NGINX CONFIGURATION #================================================= From d4baa06967dc2f5794f8f2f853249bb5637ed7e5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Aug 2022 16:16:50 +0200 Subject: [PATCH 09/13] Update config.sample.json --- conf/config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.sample.json b/conf/config.sample.json index 490fc5d..075e5b3 100644 --- a/conf/config.sample.json +++ b/conf/config.sample.json @@ -4,7 +4,7 @@ "gatewayUrl": "https://matrix.org", "applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM" }, - "defaultHomeServer": "https://__DEFAULT_SERVER__", + "defaultHomeServer": "__DEFAULT_SERVER__", "bugReportEndpointUrl": "https://element.io/bugreports/submit", "themeManifests": [ "assets/theme-element.json" From 3bb88968ca7914c5fadef25e020238251f461fc9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Aug 2022 07:36:27 +0200 Subject: [PATCH 10/13] remove subfolder install --- manifest.json | 11 ----------- scripts/install | 2 +- scripts/upgrade | 13 ------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/manifest.json b/manifest.json index 6a42fb3..62b12f1 100644 --- a/manifest.json +++ b/manifest.json @@ -32,17 +32,6 @@ "name": "domain", "type": "domain" }, - { - "name": "path", - "type": "path", - "example": "/hydrogen", - "default": "/hydrogen" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, { "name": "default_server", "type": "string", diff --git a/scripts/install b/scripts/install index 4e184a2..81dde7c 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH +path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC default_server=$YNH_APP_ARG_DEFAULT_SERVER diff --git a/scripts/upgrade b/scripts/upgrade index b9f889e..ca6851a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,19 +92,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --time --weight=1 - -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" -fi - #================================================= # NGINX CONFIGURATION #================================================= From b0eb1d059a4abca99a61d4b3c4b11eb29a163468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 Aug 2022 20:59:41 +0200 Subject: [PATCH 11/13] 0.3.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b219441..69044e5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/hydrogen-web/releases/download/v0.3.1/hydrogen-web-0.3.1.tar.gz -SOURCE_SUM=b84b2fc982faf116c3cd021dfd520621f426122e728a71ab3835f29db7a2b325 +SOURCE_URL=https://github.com/vector-im/hydrogen-web/releases/download/v0.3.2/hydrogen-web-0.3.2.tar.gz +SOURCE_SUM=b960f0aa9d16aced98d0e96b1aa4fd63a660578a148346ab41e7bb4e6cb8cbff SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 62b12f1..eac71dd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web client for Matrix", "fr": "Client web pour Matrix" }, - "version": "0.3.1~ynh1", + "version": "0.3.2~ynh1", "url": "https://matrix.org/docs/projects/client/hydrogen", "upstream": { "license": "Apache-2.0", From 775ccd07014163c64f0b3746e53cc88eec763aae Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 26 Aug 2022 18:59:47 +0000 Subject: [PATCH 12/13] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ed51c99..7d653da 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Shipped version:** 0.3.1~ynh1 +**Shipped version:** 0.3.2~ynh1 **Demo:** https://hydrogen.element.io/ diff --git a/README_fr.md b/README_fr.md index e80fffd..eb5b4f5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Version incluse :** 0.3.1~ynh1 +**Version incluse :** 0.3.2~ynh1 **Démo :** https://hydrogen.element.io/ From 611fe6e4ea478fe9777b93edef4046207b0706b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:35:40 +0100 Subject: [PATCH 13/13] Fix --- scripts/backup | 8 -------- scripts/install | 10 ---------- scripts/remove | 8 -------- scripts/restore | 7 ------- scripts/upgrade | 10 ---------- 5 files changed, 43 deletions(-) diff --git a/scripts/backup b/scripts/backup index 624abcb..6201eec 100755 --- a/scripts/backup +++ b/scripts/backup @@ -44,14 +44,6 @@ ynh_backup --src_path="$final_path" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 81dde7c..e742117 100755 --- a/scripts/install +++ b/scripts/install @@ -101,16 +101,6 @@ ynh_add_config --template="../conf/config.sample.json" --destination="$final_pat chmod 660 "$final_path/config.json" chown $app:www-data "$final_path/config.json" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 - -# Use logrotate to manage application logfile(s) -ynh_use_logrotate - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index d103517..b66e5ec 100755 --- a/scripts/remove +++ b/scripts/remove @@ -20,14 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - -# Remove the app-specific logrotate config -ynh_remove_logrotate - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index df5babc..67e9e49 100755 --- a/scripts/restore +++ b/scripts/restore @@ -63,13 +63,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ca6851a..ef96d93 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -100,16 +100,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 - -# Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append - #================================================= # END OF SCRIPT #=================================================