diff --git a/bin/bootstrap.sh b/bin/bootstrap.sh index 3eb7e2e..72bd534 100755 --- a/bin/bootstrap.sh +++ b/bin/bootstrap.sh @@ -59,6 +59,8 @@ install() { local ZIP_PACKAGE=zip local SQLITE_COMMAND=sqlite3 local SQLITE_PACKAGE="$SQLITE_COMMAND libsqlite3-dev" + local ANSIBLE_COMMAND=ansible + local ANSIBLE_PACKAGE="$ANSIBLE_COMMAND" # Load base bash library source $BIN_PATH/$LIBRARY/base.lib @@ -124,6 +126,13 @@ install() { then sops_install fi + + # Install ansible from OS Packages + command_installed $ANSIBLE_COMMAND + if [ $? -ne 0 ] + then + os_pkgs_install $ANSIBLE_PACKAGE + fi # Check for container management installed and install podman container_mode @@ -149,9 +158,9 @@ sudo bash -c "$(declare -f load_bootstrap_msg; declare -f install); install $BIN result=$? # Run install ansible with regular user -if [ $result -eq 0 ] -then +#if [ $result -eq 0 ] +#then # Load bootstrap bash library - source $BIN_HOME/$BIN_LIBS/bootstrap.lib - ansible_install -fi +# source $BIN_HOME/$BIN_LIBS/bootstrap.lib +# ansible_install +#fi diff --git a/bin/vpn_users.sh b/bin/vpn_users.sh index b0f636d..b8ed998 100755 --- a/bin/vpn_users.sh +++ b/bin/vpn_users.sh @@ -101,7 +101,7 @@ function vpn_pritunl_users_form() { dialog_form if [ $? -eq 0 ] then - display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" + display_devstools_header "${plmsg_000}" if [ "${action}" != "remove" ] then ansible-playbook -i ${BIN_HOME}/inventory/base.ini ${BIN_HOME}/bin/ansible/pritunl_users.yaml \ @@ -120,7 +120,7 @@ function vpn_pritunl_users_form() { # Check if dialog is not installed, exited! if ! command -v dialog >/dev/null 2>&1 then - display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" + display_devstools_header "${plmsg_000}" echo "${head_001}" exit 200 fi @@ -128,7 +128,7 @@ fi # Check if ansible-playbook is not installed, exited! if ! command -v ansible-playbook >/dev/null 2>&1 then - display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" + display_devstools_header "${plmsg_000}" echo "${plmsg_002}" exit 210 fi