mrosero/devs
mrosero/devs
1
0
Fork 0
Code Packages Activity

[FIXED] Correcciones:

Browse source 
- 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:
Mauro Rosero P. 2025-01-08 12:12:17 -05:00
parent 2adca5952a
commit 5313dfbd8a
Signed by: mrosero
GPG key ID: 83BD2A5F674B7E26
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bin/bootstrap.sh
View file

@ -59,6 +59,8 @@ install() {
local ZIP_PACKAGE=zip local ZIP_PACKAGE=zip
local SQLITE_COMMAND=sqlite3 local SQLITE_COMMAND=sqlite3
local SQLITE_PACKAGE="$SQLITE_COMMAND libsqlite3-dev" local SQLITE_PACKAGE="$SQLITE_COMMAND libsqlite3-dev"
local ANSIBLE_COMMAND=ansible
local ANSIBLE_PACKAGE="$ANSIBLE_COMMAND"
# Load base bash library # Load base bash library
source $BIN_PATH/$LIBRARY/base.lib source $BIN_PATH/$LIBRARY/base.lib
@ -125,6 +127,13 @@ install() {
sops_install sops_install
fi 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 # Check for container management installed and install podman
container_mode container_mode
if [ $? -eq 255 ] if [ $? -eq 255 ]
@ -149,9 +158,9 @@ sudo bash -c "$(declare -f load_bootstrap_msg; declare -f install); install $BIN
result=$? result=$?
# Run install ansible with regular user # Run install ansible with regular user
if [ $result -eq 0 ] #if [ $result -eq 0 ]
then #then
# Load bootstrap bash library # Load bootstrap bash library
source $BIN_HOME/$BIN_LIBS/bootstrap.lib # source $BIN_HOME/$BIN_LIBS/bootstrap.lib
ansible_install # ansible_install
fi #fi

6
bin/vpn_users.sh
View file

@ -101,7 +101,7 @@ function vpn_pritunl_users_form() {
dialog_form dialog_form
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" display_devstools_header "${plmsg_000}"
if [ "${action}" != "remove" ] if [ "${action}" != "remove" ]
then then
ansible-playbook -i ${BIN_HOME}/inventory/base.ini ${BIN_HOME}/bin/ansible/pritunl_users.yaml \ 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! # Check if dialog is not installed, exited!
if ! command -v dialog >/dev/null 2>&1 if ! command -v dialog >/dev/null 2>&1
then then
display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" display_devstools_header "${plmsg_000}"
echo "${head_001}" echo "${head_001}"
exit 200 exit 200
fi fi
@ -128,7 +128,7 @@ fi
# Check if ansible-playbook is not installed, exited! # Check if ansible-playbook is not installed, exited!
if ! command -v ansible-playbook >/dev/null 2>&1 if ! command -v ansible-playbook >/dev/null 2>&1
then then
display_text_header ${BIN_HOME} "${plmsg_000} ${plmsg_101}" display_devstools_header "${plmsg_000}"
echo "${plmsg_002}" echo "${plmsg_002}"
exit 210 exit 210
fi fi