diff --git a/manifest.toml b/manifest.toml index 885d4dd..5ca55b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 12.0.9" +yunohost = ">= 12.1.17" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true @@ -69,4 +69,7 @@ ram.runtime = "50M" download.additional_urls = [ "re:^__DOMAIN__/.*.css$", "re:^__DOMAIN__/.*.js$", "re:^__DOMAIN__/.*.svg$", "re:^__DOMAIN__/.*.woff2$", "re:^__DOMAIN__/favicon.*.png$" ] [resources.apt] - packages = ["redis-server"] + packages = "redis-server" + + [resources.nodejs] + version = "16" diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index f5f7b4c..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES AND CUSTOM HELPERS -#================================================= - -nodejs_version="16" diff --git a/scripts/backup b/scripts/backup index 50e701d..18e8cc6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash -source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers ynh_print_info "Declaring files to be backed up..." diff --git a/scripts/change_url b/scripts/change_url index ef434ab..cb7f89a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,6 +1,5 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 056a1a5..5f5a1cb 100644 --- a/scripts/install +++ b/scripts/install @@ -1,15 +1,7 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression "Installing dependencies..." - -ynh_nodejs_install - #================================================= # CREATE A REDIS DATABASE #================================================= diff --git a/scripts/remove b/scripts/remove index f2ae961..f6416b0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,6 +1,5 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -18,8 +17,6 @@ ynh_redis_remove_db "$redis_db" ynh_config_remove_nginx -ynh_nodejs_remove - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index a8a434e..64581cf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= @@ -17,8 +16,6 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= ynh_script_progression "Reinstalling dependencies..." -ynh_nodejs_install - ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore "/etc/systemd/system/$app.service" diff --git a/scripts/upgrade b/scripts/upgrade index 2aba8b3..d706da7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,5 @@ #!/bin/bash -source _common.sh source /usr/share/yunohost/helpers #================================================= @@ -26,13 +25,6 @@ ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_repl chmod +x "$install_dir/server/bin/prod.js" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression "Upgrading dependencies..." - -ynh_nodejs_install - #================================================= # NGINX CONFIGURATION #=================================================