escuela-comun/rap
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'networks' into 'master'

Browse Source 
permitir múltiples redes

See merge request pip/rap!6
This commit is contained in:
fauno 2024-06-26 20:24:56 +00:00
commit 57757bbce7
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common
View File

@ -63,7 +63,7 @@ add_to_file(){
# $1 nombre del nodo # $1 nombre del nodo
get_node_dir() { get_node_dir() {
node="$(get_node_name "$1")" node="$(get_node_name "$1")"
dir="${RAP_DIR}/nodos/${node}" dir="${RAP_NETWORKSDIR}/${node}"
if [ ! -d "${dir}" ] || [ ! -f "${dir}/tinc.conf" ]; then if [ ! -d "${dir}" ] || [ ! -f "${dir}/tinc.conf" ]; then
fatal_error "El nodo no existe o es inválido" fatal_error "El nodo no existe o es inválido"

10
lib/exec/init
View File

@ -63,7 +63,7 @@ if test -z "${NODE}" ; then
fi fi
# Podríamos usar get_node_dir pero chequea si ya existe, cosa que no # Podríamos usar get_node_dir pero chequea si ya existe, cosa que no
nodedir="${RAP_DIR}/nodos/${NODE}" nodedir="${RAP_NETWORKSDIR}/${NODE}"
nodefile="${nodedir}/hosts/${NODE}" nodefile="${nodedir}/hosts/${NODE}"
conffile="${nodedir}/tinc.conf" conffile="${nodedir}/tinc.conf"
@ -128,11 +128,9 @@ fi
$verbose && msg "Generando llaves..." $verbose && msg "Generando llaves..."
echo -e "\n" | tincd -c "${nodedir}" --generate-keys=${KEYSIZE} echo -e "\n" | tincd -c "${nodedir}" --generate-keys=${KEYSIZE}
# Sólo guardar el host si podemos escribir en hosts $verbose && msg "Guardando el archivo de host con los demás nodos"
if test -w "${RAP_HOSTS}"; then mkdir -p "${RAP_HOSTS}"
$verbose && msg "Guardando el archivo de host con los demás nodos" cp -f "${nodefile}" "${RAP_HOSTS}"
cp -f "${nodefile}" "${RAP_HOSTS}"
fi
# Instalar el terminar # Instalar el terminar
$install && ${RAP} install ${NODE} $install && ${RAP} install ${NODE}

3
rap
View File

@ -33,7 +33,8 @@ export RAP_LIBDIR="${RAP_LIBDIR:-${RAP_DIR}/lib}"
export RAP_EXECDIR="${RAP_EXECDIR:-${RAP_DIR}/lib/exec}" export RAP_EXECDIR="${RAP_EXECDIR:-${RAP_DIR}/lib/exec}"
export RAP_EXEC_HOOKDIR="${RAP_EXEC_HOOKDIR:-${RAP_DIR}/lib/hooks}" export RAP_EXEC_HOOKDIR="${RAP_EXEC_HOOKDIR:-${RAP_DIR}/lib/hooks}"
export RAP_SKELDIR="${RAP_SKELDIR:-${RAP_DIR}/skel}" export RAP_SKELDIR="${RAP_SKELDIR:-${RAP_DIR}/skel}"
export RAP_HOSTS="${RAP_HOSTS:-${RAP_DIR}/hosts}" export RAP_NETWORKSDIR="${RAP_NETWORKSDIR:-${RAP_DIR}/networks/${NETWORK}}"
export RAP_HOSTS="${RAP_HOSTS:-${RAP_NETWORKSDIR}/hosts}"
export RAP_COMMAND export RAP_COMMAND
export KEYSIZE=${KEYSIZE:-4096} export KEYSIZE=${KEYSIZE:-4096}
export KEYSERVER=${KEYSERVER:-"https://rap.partidopirata.com.ar"} export KEYSERVER=${KEYSERVER:-"https://rap.partidopirata.com.ar"}