Merge branch 'scripts-siempre-actualizados' into 'master'

feat: usar links simbólicos para los scripts

See merge request pip/rap!9
This commit is contained in:
fauno 2024-06-26 20:21:51 +00:00
commit 12f63b8dce
3 changed files with 4 additions and 5 deletions

View File

@ -114,10 +114,10 @@ add_to_file "${conffile}" "GraphDumpFile = /tmp/${NETWORK}.dot"
# Copiar los scripts de inicio
$verbose && msg "Copiando el resto de archivos..."
install -Dm 750 "${RAP_SKELDIR}/run-script" "${nodedir}/run-script"
ln --symbolic "${RAP_SKELDIR}/run-script" "${nodedir}/run-script"
for s in up down ; do
install -Dm 750 "${RAP_SKELDIR}"/tinc-${s} "${nodedir}"/tinc-${s}
ln --symbolic "${RAP_SKELDIR}"/tinc-${s} "${nodedir}"/tinc-${s}
done
$verbose && msg "Añadiendo hosts..."

View File

@ -50,6 +50,7 @@ ${sudo} rsync -a --no-owner \
--no-group \
--exclude="*.backup" \
--exclude="*~" \
--copy-unsafe-links \
${VERBOSE} ${DELETE} ${DRYRUN} \
"${nodedir}/" "${TINC}/"

View File

@ -67,8 +67,6 @@ test -z "${event}" && fatal_error "El evento %s no es válido" "${event}"
for _state in up down; do
# No pisar los tinc-{up,down} con run-script
if test "${event}" != "tinc" ; then
# Copiar una versión moderna de run-script
cp ${VERBOSE} --force "${RAP_SKELDIR}/run-script" "${node_dir}/"
# Y vincularla al evento-estado, de esta forma tenemos una sola copia
# siempre actualizada.
ln --force --symbolic run-script "${node_dir}/${event}-${_state}"
@ -76,4 +74,4 @@ for _state in up down; do
done
# Instalar el script para el evento
install -Dm 750 "${script}" "${node_dir}/scripts/${event}-${script##*/}"
ln --symbolic "${script}" "${node_dir}/scripts/${event}-${script##*/}"