From nobody Sun Oct 06 11:50:06 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XM0vg3jHLz5XjJN; Sun, 06 Oct 2024 11:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XM0vg0Gbrz4ySF; Sun, 6 Oct 2024 11:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728215407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFlOYVGb5UVDDozzZT/iPiRW8rR208wtG11jVLJMyms=; b=Iu1f0DlMdaghMXUFSsuqFCDxyG9EYpy6/+iNEUyYlXO5APQit7gXks0JJ3Ko/CJA8WVQXk 1uVcD05kg4UTEiSuNombFcnm1Umaccse8WN+OZ+v8LELqD5ijpkDR/UjXdWvwjUP9Akr+H +ewRhsRmkEMeHT9AoaZ+o7U3w9xln3y9NfBTDKhGMQOHCDuWPjhcdUpcEhisABMJkyVXlg xgLd90FCFY+nJujX0ATHXuwnoc8Ok/8UCe63UsG27qFgjECCPBg4iiIJHUUu166Wxz9xkQ xB/HPp4PoPb3Rz89DPt65z5DwaeNJM7GZYLncNejI9p5yEBNV4c0xWnq65L9jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728215407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFlOYVGb5UVDDozzZT/iPiRW8rR208wtG11jVLJMyms=; b=Vg3+EovyDruUrNmBChw/f0BpdSVSoAE+go+zt+XrZpEOVVo6dCX//jgP9HvIJEBy/y6HbU i8f7EFyxw4idowMdqsX2YN33W6O0MLQfqHPJLTzqPCpn8+PT1nLJhssTJ3YBOZMNlkDFX+ Z33/1vC//BgWpKDjNLmPfWqFppIs2aJm77UB9EFcb4fo6AuOU8vv7eGggGs0ifNwKIcP+2 ec6BH0slRClsLWV/g8XH5oez9PJDxj+sREZTgQnVQSHcjxuoZm+L8hkJdgBxEOddT3i2+q NBcrOfsxdCOoegoyF+IbaO2JiY3/uACvpJPe6lgNTHl5X9eORAKIoUNVXqibYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728215407; a=rsa-sha256; cv=none; b=p/Af+AfwJzj77UaHJoHO6EM32hPSlSh1EVAonKkfCWW0Y2t9dpiBOOcefMRncb66CXJKpz /lPZmk3zulFptdfr88OKEYRXaeqCz7tQxgBtLQPOuUgRIYQL5HjNwAqEvofrcSS6HYCvnD YW+6d5cJleBSYCCiN14JeGTd0QqAfa6f+w8Xt0mECQIUW1JAeHgvQ+clj4Gy635FTISf6W EbQui3SZSTvcS0FVvh0DXHoSYyReh/E8yS6dxIIdCL1d3tytB/PGwqt1iWXzVmKLuFeagE eB7N1vQuwI8VrtfR2KXyNlynqBciWp2Bt7oljVZd6UACiFTcyZb7bOzYapgMtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XM0vf6xGmz11Q0; Sun, 6 Oct 2024 11:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 496Bo6jh010965; Sun, 6 Oct 2024 11:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 496Bo67M010961; Sun, 6 Oct 2024 11:50:06 GMT (envelope-from git) Date: Sun, 6 Oct 2024 11:50:06 GMT Message-Id: <202410061150.496Bo67M010961@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 64037c225e86 - main - sysutils/zrepl-dsh2dsh: update to 0.8.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64037c225e866017a8a382493a62862941c6416c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=64037c225e866017a8a382493a62862941c6416c commit 64037c225e866017a8a382493a62862941c6416c Author: Denis Shaposhnikov <993498+dsh2dsh@users.noreply.github.com> AuthorDate: 2024-10-01 14:38:25 +0000 Commit: Robert Clausecker CommitDate: 2024-10-06 11:49:18 +0000 sysutils/zrepl-dsh2dsh: update to 0.8.4 Changelog: https://github.com/dsh2dsh/zrepl/releases/tag/v0.8.4 Add periodic daily script. PR: 281797 --- sysutils/zrepl-dsh2dsh/Makefile | 10 ++++++---- sysutils/zrepl-dsh2dsh/distinfo | 10 +++++----- sysutils/zrepl-dsh2dsh/files/pkg-message.in | 3 +++ sysutils/zrepl-dsh2dsh/files/zrepl.daily.in | 27 +++++++++++++++++++++++++++ sysutils/zrepl-dsh2dsh/files/zrepl.yml | 17 ++++++++++++++++- sysutils/zrepl-dsh2dsh/pkg-plist | 1 + 6 files changed, 58 insertions(+), 10 deletions(-) diff --git a/sysutils/zrepl-dsh2dsh/Makefile b/sysutils/zrepl-dsh2dsh/Makefile index b299d4a4ec61..a390e0b354fe 100644 --- a/sysutils/zrepl-dsh2dsh/Makefile +++ b/sysutils/zrepl-dsh2dsh/Makefile @@ -1,7 +1,6 @@ PORTNAME= zrepl DISTVERSIONPREFIX= v -DISTVERSION= 0.8.3 -PORTREVISION= 1 +DISTVERSION= 0.8.4 CATEGORIES= sysutils PKGNAMESUFFIX= -dsh2dsh @@ -20,7 +19,7 @@ GO_BUILDFLAGS= -ldflags "${STRIP} -w -X github.com/dsh2dsh/${PORTNAME}/version.$ CONFLICTS_INSTALL= ${PORTNAME} -SUB_FILES= pkg-message 500.${PORTNAME} +SUB_FILES= pkg-message 500.${PORTNAME} ${PORTNAME}.daily OPTIONS_DEFINE= EXAMPLES @@ -32,7 +31,10 @@ post-install: ${STAGEDIR}${EXAMPLESDIR}/newsyslog.conf ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.yml \ ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.sample - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily \ + ${STAGEDIR}${PREFIX}/etc/periodic/weekly + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.daily \ + ${STAGEDIR}${PREFIX}/etc/periodic/daily/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/500.${PORTNAME} \ ${STAGEDIR}${PREFIX}/etc/periodic/weekly/500.${PORTNAME} diff --git a/sysutils/zrepl-dsh2dsh/distinfo b/sysutils/zrepl-dsh2dsh/distinfo index ed630c91e26f..ca1e66007623 100644 --- a/sysutils/zrepl-dsh2dsh/distinfo +++ b/sysutils/zrepl-dsh2dsh/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1726766984 -SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.mod) = 6d039a394e4025517e66e4f016d60b5299d1541dca23913e1a8fa96bbedece12 -SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.mod) = 3638 -SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.zip) = ba1ec6e71bb449d6e01b477387cbb003c55cb66f7820f141ce4135f862a9776c -SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.3/v0.8.3.zip) = 602193 +TIMESTAMP = 1727718613 +SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.mod) = 6d039a394e4025517e66e4f016d60b5299d1541dca23913e1a8fa96bbedece12 +SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.mod) = 3638 +SHA256 (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.zip) = f4a6f71ae6711e8307f4d1bb2a53e653b11ed3389c879597800a331db674fd39 +SIZE (go/sysutils_zrepl-dsh2dsh/zrepl-v0.8.4/v0.8.4.zip) = 605289 diff --git a/sysutils/zrepl-dsh2dsh/files/pkg-message.in b/sysutils/zrepl-dsh2dsh/files/pkg-message.in index 92f9099f1f50..c8dc1af29cda 100644 --- a/sysutils/zrepl-dsh2dsh/files/pkg-message.in +++ b/sysutils/zrepl-dsh2dsh/files/pkg-message.in @@ -7,6 +7,9 @@ SETUP BEFORE FIRST USE: - Create the log file /var/log/zrepl.log: # service newsyslog restart - Modify the %%PREFIX%%/etc/zrepl/zrepl.yml configuration file +- Create ZFS datasets like: + # zfs create -o mountpoint=none -o readonly=on zdisk/zrepl + # zfs create zdisk/zrepl/localhost - Enable the zrepl daemon to start automatically at boot: # sysrc zrepl_enable="YES" - Start the zrepl daemon: diff --git a/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in b/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in new file mode 100644 index 000000000000..03b663264090 --- /dev/null +++ b/sysutils/zrepl-dsh2dsh/files/zrepl.daily.in @@ -0,0 +1,27 @@ +#!/bin/sh + +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +: "${daily_zrepl_enable=NO}" +: "${daily_zrepl_warn=15m}" +: "${daily_zrepl_crit=1h}" +zrepl="%%PREFIX%%/bin/zrepl" + +case "$daily_zrepl_enable" in + [Yy][Ee][Ss]) + if service zrepl enabled; then + echo + echo "Check zrepl status:" + $zrepl monitor alive -w "$daily_zrepl_warn" -c "$daily_zrepl_crit" + $zrepl monitor snapshots + fi + ;; +esac + +# assigned in periodic.conf +# shellcheck disable=SC2086,SC2154 +exit $rc diff --git a/sysutils/zrepl-dsh2dsh/files/zrepl.yml b/sysutils/zrepl-dsh2dsh/files/zrepl.yml index 048f5d58b1a5..c52b4e016317 100644 --- a/sysutils/zrepl-dsh2dsh/files/zrepl.yml +++ b/sysutils/zrepl-dsh2dsh/files/zrepl.yml @@ -60,6 +60,22 @@ jobs: placeholder: encryption: "inherit" monitor: &monitor-snapshots + count: + - prefix: "zrepl_frequently_" + warning: 18 + critical: 30 + - prefix: "zrepl_hourly_" + warning: 32 + critical: 50 + - prefix: "zrepl_daily_" + warning: 92 + critical: 100 + - prefix: "zrepl_monthly_" + warning: 14 + critical: 15 + - prefix: "" # everything else + warning: 2 + critical: 10 latest: - prefix: "zrepl_frequently_" critical: "48h" # 2d @@ -94,7 +110,6 @@ jobs: # them one by one. #one_step: true concurrency: - steps: 4 size_estimates: 8 conflict_resolution: &conflict_resolution initial_replication: "all" diff --git a/sysutils/zrepl-dsh2dsh/pkg-plist b/sysutils/zrepl-dsh2dsh/pkg-plist index 7f2c52e6e5f6..fcb072f2a996 100644 --- a/sysutils/zrepl-dsh2dsh/pkg-plist +++ b/sysutils/zrepl-dsh2dsh/pkg-plist @@ -1,4 +1,5 @@ bin/zrepl +etc/periodic/daily/zrepl etc/periodic/weekly/500.zrepl @sample %%ETCDIR%%/zrepl.yml.sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bandwidth_limit.yml