[FIXED] Correcciones:
- bootstrap.sh: se corrige la instalación de ansilbe usando paquete de sistema - vpn_users.sh: se usa la función para el despliegue de titulo de proyecto global devs
This commit is contained in:
parent
2adca5952a
commit
5313dfbd8a
2 changed files with 17 additions and 8 deletions
|
@ -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
|
||||
|
@ -125,6 +127,13 @@ install() {
|
|||
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
|
||||
if [ $? -eq 255 ]
|
||||
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue