diff --git a/scripts/_common.sh b/scripts/_common.sh index 8a15aaa..e8fd2a4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,8 @@ #================================================= # dependencies used by the app -pkg_dependencies="nomad" +pkg_dependencies="" +extra_pkg_dependencies="nomad" server_pkg_dependencies="" diff --git a/scripts/install b/scripts/install index 27645a0..e071819 100644 --- a/scripts/install +++ b/scripts/install @@ -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 diff --git a/scripts/restore b/scripts/restore index 7ecc196..cdc1c18 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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 diff --git a/scripts/upgrade b/scripts/upgrade index c48777c..853cc02 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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