From nobody Mon Mar 13 22:02:51 2023 X-Original-To: dev-commits-ports-all@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 4Pb9d85t9Zz3yG0f; Mon, 13 Mar 2023 22:02:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pb9d80L1qz3KXy; Mon, 13 Mar 2023 22:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678744972; 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=G1nd0M5fYkxSPtWtjwtcATgv2N/nNLfqfzJY+lQ6lBY=; b=LINH3oYh0kn16z/4ONHH4Eu0MfpDJnp8laH8lvB0jngzl93Fc6FezqKNc1fRURhhork8/d Zi4he0vgm5an9JaO+vuVbv6scjCIuCKtktdP23xxyjTCbUjI0XjH0AnBEebVbhGpLa5s+k 21is74U/fDtveioV66iVG0HkvhC5buB5VZCadwJeLXUNGpYEfAc5hm+TnrYY26zdsibD6B B8RNeMOLjQNzzeB+oHDjiqxXSBFYeP9FtNq1UAf2/NOmIu0lgqLttp+O7jhELkNqRg9YiM 2ByRknjHEULXqc1BMEY/VMROqaW+Jc4X8PP+UAXugg7ezn6HgJ+oYJqZPXeGbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678744972; 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=G1nd0M5fYkxSPtWtjwtcATgv2N/nNLfqfzJY+lQ6lBY=; b=TUgVeObABtvzcopzhd3AEn+NgjpeUhArnzwszcYzrXkowAfgglSVFj66Tp6VTwuXicqX1/ JI59TYNPGvVjPIBwbW9dVJTxe4BOHuoM8xcx3n70E8gQQ8HlV80UmKUn0cR1t3JrJQ7D47 /atXtj3Hqgb3UvLuFcz7WIw7Ni7edVJNfwF7UGHIKvqxQ8gJPDM35qS3XtTKco0+pzeRuV uDSlv6iXz4uriaRjRePEZVlHfqWGKhJ6U+UDIWC8Bxt/kBN6CCDp8k1fjAzsx0QaSLzCke he34X/gt6Ix/Nte8x4Ugla7DD6QpJzCsVty47CMsO1iw5S+MYyndTW0IGetNyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678744972; a=rsa-sha256; cv=none; b=SH/VoK9ZVfdH3dXHRZ+RHCf4sq0SEikBrYI7odqiR17hqr6jq5ogB79zhe0CL0L3QGVbyH NhVixAokHCLW3CzbdCSWAhybTki0SZ4atS1UG3bvPIJHsWWfLxnkI8NpkcP1fwJnULnibH eipBl8H2iJ1qhfTcWGIUI7/DBUn1nNyafLaAYJMeopi63Ot8S2vLcXF70O4hRlHnUMZRgq cVW7NW88gqf1iMb8P0LrAX4/uvHpYLdLGxZNJzy2AEfpejGfgc2U6cpyZjQdaDXe1oG9Ab tzlV2zuF9Fs0Xz2D9sU+a81XzuLYR9ayjHSJsMB/ccG+po1eVGuRn53VOXIZ6w== 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 4Pb9d76XFqz19Mk; Mon, 13 Mar 2023 22:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32DM2pCF049271; Mon, 13 Mar 2023 22:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DM2p7N049270; Mon, 13 Mar 2023 22:02:51 GMT (envelope-from git) Date: Mon, 13 Mar 2023 22:02:51 GMT Message-Id: <202303132202.32DM2p7N049270@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 6ca9b1e6c0e9 - main - net-mgmt/unifi7: Fix upgrade steps List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ca9b1e6c0e9f5f2b7430c1126e1f22cd3b35e2b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ca9b1e6c0e9f5f2b7430c1126e1f22cd3b35e2b commit 6ca9b1e6c0e9f5f2b7430c1126e1f22cd3b35e2b Author: Juraj Lutter AuthorDate: 2023-03-13 21:57:22 +0000 Commit: Juraj Lutter CommitDate: 2023-03-13 22:02:37 +0000 net-mgmt/unifi7: Fix upgrade steps As suggested, make the upgrade steps in pkg-message and UPDATING more accurate. PR: 270171 --- UPDATING | 21 +++++++++++++------ net-mgmt/unifi7/Makefile | 2 +- net-mgmt/unifi7/files/pkg-message.in | 39 ++++++++++++++++++++---------------- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/UPDATING b/UPDATING index 913c156b25b3..6d648be11f16 100644 --- a/UPDATING +++ b/UPDATING @@ -28,15 +28,24 @@ you update your ports collection, before attempting any port upgrades. 2. Stop the unifi7 service (if running) - 3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data/db - to a safe location. + 3. Copy the "backup" directory from LOCALBASE/share/java/unifi/data + to a safe location. Also copy keystore and system.properties if + you have made any modifications to those files - 4. Remove all files and directories under - LOCALBASE/share/java/unifi/data/db + 4. Remove files and directories under LOCALBASE/share/java/unifi/data - 5. Upgrade the package and start the service + 5. Upgrade the package - 6. Restore the configuration from backup + 6. Copy the "backup" directory from a safe location back to + LOCALBASE/share/java/unifi/data + + 7. Start the service + + 8. Restore the configuration from backup + + As an optional step, review system.properties and keystore to merge any + manual modifications you have made (this has to be done with the application + stopped) 20230310: AFFECTS: user of benchmarks/ddosify diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile index 921d5dba4fe9..578835a7ba54 100644 --- a/net-mgmt/unifi7/Makefile +++ b/net-mgmt/unifi7/Makefile @@ -1,6 +1,6 @@ PORTNAME= unifi7 PORTVERSION= 7.3.83 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \ https://repo1.maven.org/maven2/%SUBDIR%/:jax diff --git a/net-mgmt/unifi7/files/pkg-message.in b/net-mgmt/unifi7/files/pkg-message.in index 34b97e7333bf..8974e9b59e89 100644 --- a/net-mgmt/unifi7/files/pkg-message.in +++ b/net-mgmt/unifi7/files/pkg-message.in @@ -10,25 +10,30 @@ One of implications is that the instance MUST be restored from backup. The upgrade path can be as following: -- Take a backup from within the unifi7 application BEFORE stopping or - restarting the service. - -- Stop the unifi7 service. - -- Copy the "backup" directory from %%LOCALBASE%%/share/java/unifi/data/db - to a safe location. - -- Remove all files and directories under - %%LOCALBASE%%/share/java/unifi/data/db - +- Take a backup from within the unifi7 application PRIOR to + updating! + +- Stop the unifi7 service (if running) + +- Copy the "backup" directory from %%LOCALBASE%%/share/java/unifi/data + to a safe location. Also copy keystore and system.properties if + you have made any modifications to those files + +- Remove files and directories under %%LOCALBASE%%/share/java/unifi/data + - Upgrade the package + +- Copy the "backup" directory from a safe location back to + %%LOCALBASE%%/share/java/unifi/data + +- Start the service + +- Restore the configuration from backup + +- Review system.properties and keystore to merge any manual + modifications you have made (this has to be done with + the application stopped) -- Copy the "backup" directory from the safe place to - %%LOCALBASE%%/share/java/unifi/data/db - -- Start the service. - -- Restore the configuration from backup. EEOOMM } ]