1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/nomad_ynh.git synced 2024-09-03 19:55:53 +02:00

better dependencies management

This commit is contained in:
yalh76 2022-07-23 17:10:52 +02:00
parent dd981783dd
commit 556f154522
4 changed files with 14 additions and 10 deletions

View file

@ -5,7 +5,8 @@
#=================================================
# dependencies used by the app
pkg_dependencies="nomad"
pkg_dependencies=""
extra_pkg_dependencies="nomad"
server_pkg_dependencies=""

View file

@ -100,7 +100,7 @@ ynh_script_progression --message="Installing dependencies..."
if [ "$node_type" == "server" ]
then
ynh_install_app_dependencies $server_pkg_dependencies
pkg_dependencies="$pkg_dependencies $server_pkg_dependencies"
fi
if [ "$node_type" == "client" ]
@ -110,9 +110,10 @@ then
client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
ynh_exec_warn_less ynh_install_go --go_version=$go_version
fi
ynh_install_app_dependencies $client_pkg_dependencies
pkg_dependencies="$pkg_dependencies $client_pkg_dependencies"
fi
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$extra_pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
#=================================================
# CREATE DEDICATED USER

View file

@ -74,7 +74,7 @@ ynh_script_progression --message="Reinstalling dependencies..."
if [ "$node_type" == "server" ]
then
ynh_install_app_dependencies $server_pkg_dependencies
pkg_dependencies="$pkg_dependencies $server_pkg_dependencies"
fi
if [ "$node_type" == "client" ]
@ -83,9 +83,10 @@ then
then
client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
fi
ynh_install_app_dependencies $client_pkg_dependencies
pkg_dependencies="$pkg_dependencies $client_pkg_dependencies"
fi
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$extra_pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
#=================================================
# RESTORE THE NGINX CONFIGURATION

View file

@ -88,7 +88,7 @@ ynh_script_progression --message="Upgrading dependencies..."
if [ "$node_type" == "server" ]
then
ynh_install_app_dependencies $server_pkg_dependencies
pkg_dependencies="$pkg_dependencies $server_pkg_dependencies"
fi
if [ "$node_type" == "client" ]
@ -98,9 +98,10 @@ then
client_pkg_dependencies="$client_pkg_dependencies $client_lxc_pkg_dependencies"
ynh_exec_warn_less ynh_install_go --go_version=$go_version
fi
ynh_install_app_dependencies $client_pkg_dependencies
pkg_dependencies="$pkg_dependencies $client_pkg_dependencies"
fi
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
ynh_install_app_dependencies $pkg_dependencies
ynh_install_extra_app_dependencies --repo="deb https://apt.releases.hashicorp.com $(lsb_release -cs) main" --package="$extra_pkg_dependencies" --key="https://apt.releases.hashicorp.com/gpg"
#=================================================
# NGINX CONFIGURATION