From c004dc03d8f14327f97c59119447819e8d08227b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 12:09:58 +0200 Subject: [PATCH 01/10] Update manifest.toml --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index df7b0de..d243d6d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://coder.com/docs/code-server/latest/FAQ" code = "https://github.com/coder/code-server" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.2" architectures = ["amd64", "arm64", "armhf"] multi_instance = true ldap = false @@ -29,7 +29,6 @@ ram.runtime = "100M" [install] [install.domain] type = "domain" - full_domain = true [install.admin] type = "user" From 79a0867493158c8f1f3514a4691e09f67d0923b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Sep 2023 14:33:49 +0200 Subject: [PATCH 02/10] Update manifest.toml --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index d243d6d..ebaf808 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,6 +30,10 @@ ram.runtime = "100M" [install.domain] type = "domain" + [install.init_main_permission] + type = "group" + default = "visitors" + [install.admin] type = "user" From df66e1008afbf0b0195805094a51eb3e363dcc32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Sep 2023 15:14:17 +0200 Subject: [PATCH 03/10] Update manifest.toml --- manifest.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index ebaf808..38aee2f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -30,10 +30,6 @@ ram.runtime = "100M" [install.domain] type = "domain" - [install.init_main_permission] - type = "group" - default = "visitors" - [install.admin] type = "user" @@ -63,3 +59,4 @@ ram.runtime = "100M" [resources.permissions] main.url = "/" + main.allowed = "admins" From 59bd67384e90cb24eb53dd0a67c264731e240776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Sep 2023 15:15:22 +0200 Subject: [PATCH 04/10] cleaning --- scripts/install | 1 - scripts/restore | 7 ------- scripts/upgrade | 24 +++--------------------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/scripts/install b/scripts/install index b786d7f..557e8f4 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,6 @@ chown root:$admin "$install_dir/code-server.env" #================================================= # SET PERMISSION FOR THE USER #================================================= -ynh_permission_update --permission="main" --add="$admin" chown -R $admin:$admin "$data_dir" diff --git a/scripts/restore b/scripts/restore index b12de36..a7250e6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -46,13 +46,6 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$app.log" -#================================================= -# SET PERMISSION FOR THE USER -#================================================= -ynh_permission_update --permission="main" --add="$admin" - -chown -R $admin:$admin "$data_dir" - #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9ef5a47..b4259b9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,14 +82,6 @@ chmod -R o-rwx "$install_dir" chown -R root:$admin "$install_dir" chmod +x "$install_dir/bin/code-server" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPDATE A CONFIG FILE #================================================= @@ -111,30 +103,20 @@ chown $admin:$admin "$install_dir/config.yaml" "$install_dir/code-server.env" #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +# Create a dedicated NGINX config +ynh_add_nginx_config + # Create a dedicated systemd config ynh_add_systemd_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 -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$app.log" #================================================= # SET PERMISSION FOR THE USER #================================================= -ynh_permission_update --permission="main" --add="$admin" chown -R $admin:$admin "$data_dir" From 3a3899e56b2ce538a35b4387d684dfce66e3b830 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:26:07 +0200 Subject: [PATCH 05/10] Update scripts/restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index a7250e6..77c7e7d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -45,7 +45,7 @@ mkdir -p "/var/log/$app" ynh_restore_file --origin_path="/etc/logrotate.d/$app" yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$app.log" - +chown -R $admin:$admin "$data_dir" #================================================= # START SYSTEMD SERVICE #================================================= From 5dff1d008ac3cf86f6948adab6e8861081a26099 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:27:46 +0200 Subject: [PATCH 06/10] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 38aee2f..d243d6d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -59,4 +59,3 @@ ram.runtime = "100M" [resources.permissions] main.url = "/" - main.allowed = "admins" From 9460b859e9a2f71ce5462007e6845e327fafaa9e Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:27:53 +0200 Subject: [PATCH 07/10] Update scripts/install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 557e8f4..b786d7f 100755 --- a/scripts/install +++ b/scripts/install @@ -60,6 +60,7 @@ chown root:$admin "$install_dir/code-server.env" #================================================= # SET PERMISSION FOR THE USER #================================================= +ynh_permission_update --permission="main" --add="$admin" chown -R $admin:$admin "$data_dir" From 16f76a73017c16a0975e0af27eb1db63217531d0 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:28:00 +0200 Subject: [PATCH 08/10] Update scripts/restore --- scripts/restore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/restore b/scripts/restore index 77c7e7d..2ddd84e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -45,6 +45,8 @@ mkdir -p "/var/log/$app" ynh_restore_file --origin_path="/etc/logrotate.d/$app" yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$app.log" + +ynh_permission_update --permission="main" --add="$admin" chown -R $admin:$admin "$data_dir" #================================================= # START SYSTEMD SERVICE From 077516daffc2fb19f4c45f525c49c7b6935b9f71 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Sat, 23 Sep 2023 17:28:07 +0200 Subject: [PATCH 09/10] Update scripts/upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index b4259b9..4cae072 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -117,6 +117,7 @@ yunohost service add $app --description="VS Code Server" --log="/var/log/$app/$a #================================================= # SET PERMISSION FOR THE USER #================================================= +ynh_permission_update --permission="main" --add="$admin" chown -R $admin:$admin "$data_dir" From cc7bc8e85c6349b5b097cf22d78aaecf4ff1c6c9 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Wed, 27 Sep 2023 22:02:28 +0200 Subject: [PATCH 10/10] Upgrade to v4.17.0 (#64) * Upgrade to v4.17.0 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ec5d465..c63e2e2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Run VS Code on your server and access it in the browser -**Shipped version:** 4.16.1~ynh2 +**Shipped version:** 4.17.0~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b13a4b6..cd0027f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Run VS Code on your server and access it in the browser -**Version incluse :** 4.16.1~ynh2 +**Version incluse :** 4.17.0~ynh2 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index d243d6d..e060fde 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "code-server" description.en = "Run VS Code on your server and access it in the browser" description.fr = "Lancez VS Code sur votre serveur et accédez-y depuis votre navigateur" -version = "4.16.1~ynh2" +version = "4.17.0~ynh2" maintainers = ["Tagada"] @@ -35,12 +35,12 @@ ram.runtime = "100M" [resources] [resources.sources.main] - amd64.url = "https://github.com/coder/code-server/releases/download/v4.16.1/code-server-4.16.1-linux-amd64.tar.gz" - amd64.sha256 = "e10bc642be9fe8a802f556737b1bbb910ef818979a35034b092c85e62a42d1a7" - arm64.url = "https://github.com/coder/code-server/releases/download/v4.16.1/code-server-4.16.1-linux-arm64.tar.gz" - arm64.sha256 = "a256429887531d855baaa6b14b25906f69fa4b4a977b1ae0def001016fb37b81" - armhf.url = "https://github.com/coder/code-server/releases/download/v4.16.1/code-server-4.16.1-linux-armv7l.tar.gz" - armhf.sha256 = "38081417b8e10160f4c54aea93b24faeeb1bafbd4e41de021fd78a673f09daa6" + amd64.url = "https://github.com/coder/code-server/releases/download/v4.17.0/code-server-4.17.0-linux-amd64.tar.gz" + amd64.sha256 = "12ba07cee7b6c5bbd172f8bac52bb01029f4d291cb22615d1ec92b9760d6546d" + arm64.url = "https://github.com/coder/code-server/releases/download/v4.17.0/code-server-4.17.0-linux-arm64.tar.gz" + arm64.sha256 = "4c71fc2660f4f3f580f8ba1a6858a8d5cf99e0805d27b5e7db79672c5777d967" + armhf.url = "https://github.com/coder/code-server/releases/download/v4.17.0/code-server-4.17.0-linux-armv7l.tar.gz" + armhf.sha256 = "0a8755393281ecb82ebbf6344b0e2ea3b6dee3024457d1d6a28489d8a8eeb3f6" autoupdate.strategy = "latest_github_release" autoupdate.asset.arm64 = "code-server-.*-linux-arm64.tar.gz"