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

Added composition.printAllSyncingHosts() to remove hard coded file dependencies and renamed composition-sync-hosts to zfssync-hosts

Browse Source
This commit is contained in:
m8in
2026-06-24 22:49:16 +02:00
parent 423d1c38e9
commit 8a4426961c
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/host/zfs/composition-sync/setupSyncHost.sh
+3 -5
View File
@@ -10,10 +10,9 @@ base.loadModule composition
function setup() {
local _COMPOSITION _COMPOSITIONS_FOLDER _SYNC_HOSTS_FILE
local _COMPOSITION _COMPOSITIONS_FOLDER
_COMPOSITION="${1}"
_COMPOSITIONS_FOLDER="${CIS[DOMAINDEFINITIONS]}compositions/"
_SYNC_HOSTS_FILE="${_COMPOSITIONS_FOLDER}${_COMPOSITION}/composition-sync-hosts"
readonly _COMPOSITION _COMPOSITIONS_FOLDER
echo "Setup the host that receives the composition of others ..."
@@ -21,7 +20,7 @@ function setup() {
echo "No folder for your defined composition settings found: ${_COMPOSITIONS_FOLDER}"
echo "Please create it and add your custom composition settings in there, following this convention:"
echo " 1.) './NAME_OF_THE_COMPOSITION/running-host' containing one line with the FQDN of the host running the composition."
echo " 2.) './NAME_OF_THE_COMPOSITION/composition-sync-hosts' containing a list of hosts receiving the composition, one host with its FQDN per line."
echo " 2.) './NAME_OF_THE_COMPOSITION/zfssync-hosts' containing a list of hosts receiving the composition, one host with its FQDN per line."
echo
[ -d "${_COMPOSITIONS_FOLDER}" ] \
@@ -34,9 +33,8 @@ function setup() {
&& echo
[ -n "${_COMPOSITION}" ] \
&& [ -f "${_SYNC_HOSTS_FILE}" ] \
&& echo "Following hosts should sync the ZFS of this composition '${COMPOSITION}':" \
&& cat "${_SYNC_HOSTS_FILE}" \
&& composition.printAllSyncingHosts "${_COMPOSITION}" \
&& echo
echo "Optionally you can create following file:"
script/host/zfs/composition-sync/sync.sh
+2 -2
View File
@@ -207,9 +207,9 @@ function receiveOnceSingle() {
function usage() {
echo
echo 'Commands:'
echo ' --loopAll : This will start one screen session per composition ("composition-sync-hosts"),'
echo ' --loopAll : This will start one screen session per composition ("zfssync-hosts"),'
echo ' and run the sync process in an endless loop.'
echo ' --onceAll : This will run the sync process once for each composition ("composition-sync-hosts").'
echo ' --onceAll : This will run the sync process once for each composition ("zfssync-hosts").'
echo ' e.g.: you can use it in crontab as a daily backup.'
echo ' --loopSingle COMPOSITION : This will run the sync process in an endless loop but just for the specified COMPOSITION.'
echo ' --onceSingle COMPOSITION : This will run the sync process once just for the specified COMPOSITION.'
script/monitor/generic/COMPOSITION_SYNC_CHECK.sh
+4 -3
View File
@@ -1,5 +1,6 @@
#!/bin/bash
source /cis/core/base.module.sh
base.loadModule composition
base.loadModule ssh
@@ -51,12 +52,12 @@ function checkSync() {
local _COMPOSITION_PATH
for _COMPOSITION_PATH in "${CIS[COMPOSITIONS]}"*; do
local _COMPOSITION_NAME="${_COMPOSITION_PATH##*/}" #Removes longest matching pattern '*/' from the begin
# If remote host is found than it is responsible for this container-composition, otherwise skip
# (grep -E "^[[:blank:]]*something" means. Line has to start with "something", leading blank chars are ok.)
grep -E "^[[:blank:]]*${_REMOTE_HOSTNAME_SHORT}" "${_COMPOSITION_PATH}/composition-sync-hosts" &> /dev/null \
composition.shouldBeSyncedByGivenHost "${_COMPOSITION_NAME}" "${_REMOTE_HOSTNAME_FQDN}" \
|| continue;
local _COMPOSITION_NAME="${_COMPOSITION_PATH##*/}" #Removes longest matching pattern '*/' from the begin
local _LAST_SNAPSHOT_UNIXTIME="$(echo "${_SNAPSHOTS}" | grep ${_COMPOSITION_NAME} | tail -n 1 | cut -d' ' -f1)"
local _SECONDS_BEHIND=$[ ${_NOW_UTC_UNIXTIME} - ${_LAST_SNAPSHOT_UNIXTIME} ]