From dfa4ff1614d3da59278cdbd1d353b99ffc298e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 10 Jun 2023 17:35:18 +0200 Subject: [PATCH] linter --- conf/systemd.service | 2 +- doc/{DISCLAIMER.md => ADMIN.md} | 0 doc/{DISCLAIMER_fr.md => ADMIN_fr.md} | 0 manifest.toml | 8 +++++++- scripts/change_url | 7 ------- scripts/install | 5 ----- tests.toml | 5 +++++ 7 files changed, 13 insertions(+), 14 deletions(-) rename doc/{DISCLAIMER.md => ADMIN.md} (100%) rename doc/{DISCLAIMER_fr.md => ADMIN_fr.md} (100%) create mode 100644 tests.toml diff --git a/conf/systemd.service b/conf/systemd.service index aa317d2..bda4cf7 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Wetty Web Terminal +Description=Wetty: Web Terminal After=network.target [Service] diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md diff --git a/doc/DISCLAIMER_fr.md b/doc/ADMIN_fr.md similarity index 100% rename from doc/DISCLAIMER_fr.md rename to doc/ADMIN_fr.md diff --git a/manifest.toml b/manifest.toml index 4a6b22f..15e64ef 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,7 @@ license = "free" website = "https://github.com/butlerx/wetty/" [integration] -yunohost = ">=11.1.0" +yunohost = ">=11.1.20" architectures = "all" multi_instance = true ldap = "not_relevant" @@ -52,3 +52,9 @@ ram.runtime = "?" # FIXME: replace with an **estimate** minimum ram requirement. [resources.ports] main.default = 8095 + + [resources.apt] + packages = "" + extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" + extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" + extras.yarn.packages = "yarn" diff --git a/scripts/change_url b/scripts/change_url index 0b9155e..25c2008 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,13 +50,6 @@ 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" --line_match="Server started" -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index c17e370..b478ae5 100755 --- a/scripts/install +++ b/scripts/install @@ -17,11 +17,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=6 # Install nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -# Install Yarn -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" \ - --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..d7d98af --- /dev/null +++ b/tests.toml @@ -0,0 +1,5 @@ +test_format = 1.0 + +[default] + + test_upgrade_from.e7ffa9512f59c8c2097512a4b6613524c5284e77.name = "Upgrade from 2.0.3~ynh4"