Everbrent/cis
8
0
Fork 0
mirror of https://github.com/m8tin/cis.git synced 2026-08-01 11:47:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

small improvements

Browse Source
This commit is contained in:
m8in
2026-07-02 21:11:42 +02:00
parent c0d7300358
commit 70eda31aca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/host/zfs/composition-sync/sync.sh
+1 -1
View File
@@ -95,7 +95,7 @@ function receive() {
base.set _SOURCEHOST "$(composition.printRunningHost "${_COMPOSITION}")" '^[a-zA-Z0-9][a-zA-Z0-9.-]*$' base.set _SOURCEHOST "$(composition.printRunningHost "${_COMPOSITION}")" '^[a-zA-Z0-9][a-zA-Z0-9.-]*$'
_SSH_PORT=$(head -n 1 "${CIS[DOMAINDEFINITIONS]:?"Missing CIS_DOMAINDEFINITIONS"}compositions/${_COMPOSITION}/ssh-port" 2> /dev/null) _SSH_PORT=$(head -n 1 "${CIS[DOMAINDEFINITIONS]:?"Missing CIS_DOMAINDEFINITIONS"}compositions/${_COMPOSITION}/ssh-port" 2> /dev/null)
base.set _SSH_PORT "${_SSH_PORT:-22}" '^[1-9][0-9]{1,4}$' base.set _SSH_PORT "${_SSH_PORT:-22}" '^[1-9][0-9]{1,4}$'
_SSH_COMMAND="ssh -p ${_SSH_PORT} -o ConnectTimeout=20 -o ServerAliveInterval=15 -C composition-sync@${_SOURCEHOST}" _SSH_COMMAND="ssh -n -p ${_SSH_PORT} -o ConnectTimeout=20 -o ServerAliveInterval=15 -C composition-sync@${_SOURCEHOST}"
_SEND_SCRIPT="${CIS[SCRIPTSROOT]:?"Missing CIS_SCRIPTSROOT"}host/zfs/composition-sync/sync-send.sh" _SEND_SCRIPT="${CIS[SCRIPTSROOT]:?"Missing CIS_SCRIPTSROOT"}host/zfs/composition-sync/sync-send.sh"
_ZFS_BACKUP="$(composition.printZfs "${_COMPOSITION}")-BACKUP" _ZFS_BACKUP="$(composition.printZfs "${_COMPOSITION}")-BACKUP"
readonly _RECEIVERHOST _COMPOSITION _SSH_COMMAND _SEND_SCRIPT _ZFS_BACKUP readonly _RECEIVERHOST _COMPOSITION _SSH_COMMAND _SEND_SCRIPT _ZFS_BACKUP
script/host/zfs/snapshot.sh
+1 -1
View File
@@ -14,7 +14,7 @@ function cleanup() {
readonly _KEEP_MINUTELY _KEEP_HOURLY _KEEP_DAILY _KEEP_MONTHLY readonly _KEEP_MINUTELY _KEEP_HOURLY _KEEP_DAILY _KEEP_MONTHLY
local _COMPOSITION _ZFS local _COMPOSITION _ZFS
composition.printAll | while read -r _COMPOSITION; do { composition.printAllRunningOnThisHost; composition.printAllSyncedByThisHost; } | while read -r _COMPOSITION; do
_ZFS="$(composition.printZfsVerified "${_COMPOSITION}")" _ZFS="$(composition.printZfsVerified "${_COMPOSITION}")"
[ -n "${_ZFS}" ] \ [ -n "${_ZFS}" ] \