From nobody Tue Feb 1 15:24:16 2022 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 0FF57191590A; Tue, 1 Feb 2022 15:24:18 +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 4Jp7y90wh2z3Fsk; Tue, 1 Feb 2022 15:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729057; 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=D9tJGRpqSoMQmnMFNNfKkJAn/NiEIp40rkcdJ5uIknk=; b=jgLfFRLl6n3snPLrA31NCkXztdzLcK/Fkgccd2/kmC91N2Ilbu6UEmAjfLJCWCUB33A6Pr kkO+GcLQlCtQ1QnmHSze8k27IwD3y5DHZmP/rk34UwtoOoXgwjTjZBwgp02Mo+V4kC/Yns i2QD8sxPQZKosRkvl1lue3E6gwhEqpH+JidMT8nuU1fQ3mdpLsvnNuCY7AQPfAEayNgxqA EJP/rLSfvR0hkuuebgbNgs0hqKou/10Vkcnvf+ugUs2dpJBguxw+RAhLTDCmSSl56mIS7x Sip6u0r1A3vLHqoL0LM/+2RROuSWwkLcupO/FTaPh1gtGFKKS8tf64BsYkY+Cw== 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 7E3A313593; Tue, 1 Feb 2022 15:24:16 +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 211FOG6Y050865; Tue, 1 Feb 2022 15:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FOGxB050864; Tue, 1 Feb 2022 15:24:16 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:24:16 GMT Message-Id: <202202011524.211FOGxB050864@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: c2f30dc007f6 - main - net/ceph14: Upgrade with new dashboard install, and minor dependency fix (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2f30dc007f6818732c4a12b15955568bc7a66bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729057; 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=D9tJGRpqSoMQmnMFNNfKkJAn/NiEIp40rkcdJ5uIknk=; b=FKeiwfHeQyohNiA3+5S8F63GZJu+501ZLgaNGO5LtClmSgYt7rDeYVZ4+omNPnjF9YV6cN i5hYBBBPF/jM2TqO7hIqR2/BRNmMBN3n6fL7viqYBJa2/aATdzLFcfKhwrpayz+0WmySzB 3O7iOQQl/RscF/EpDwyj+ymHHNLZBUm/XtDBBS5ihIZHLADqbxH4LRQzgAnKwZquHxQcAu JWd1i3srx2nB9onXVOgC06uxVOLmAZRjJYdbcb0r827eWsE/HLrkgUARUKP5rRWhhsw10A u+XKqfWvvnAvcngNVhmb522XQ+P+fhyak35JPJc60CtKhjv+Pus/39clW9KvxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729057; a=rsa-sha256; cv=none; b=B/l8VNolGNJtiSwO9uma7wF3swjmERnV3sYmJl4TXftUxWUAkzgswVzz5V3CUx/716tNku XiHPPNyO4tNT6myd2tBU0aBlOXQY5DdRg4E/HmRA+lOs1GQCg2WV9C4xPWWRHdDaNAA+Re 97x3bXEIy8gMPRHdY1srM3WJ788EEEx0ZYm6w+BHLuVDiBzMSr7nrZ3o7l4cvtNA0I1ZhE QRZ+im9ctD5+ISV4MYmgStyQNZe4F5RqltY0f2DFhMOsAUbP7zz4FgNTP8zV7nCtM/z2UJ 8j/lV5rAoOC9DrgvePrUlaCmYrN92ROl47DhnqSnmtzgvg0bVg5f+XLhUIGXRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2f30dc007f6818732c4a12b15955568bc7a66bc commit c2f30dc007f6818732c4a12b15955568bc7a66bc Author: Dima Panov AuthorDate: 2022-02-01 15:22:15 +0000 Commit: Dima Panov CommitDate: 2022-02-01 15:22:15 +0000 net/ceph14: Upgrade with new dashboard install, and minor dependency fix (+) Install instructions were incomplete and did not work for others. Also added a required python dependancy PR: 261649 Sponsored by: Netzkommune GmbH. --- net/ceph14/Makefile | 8 ++++---- net/ceph14/pkg-message | 33 +++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 43b50902a207..4b49cab54e06 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -3,7 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -51,15 +51,15 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \ pkgconfig python:3.8-3.9 readline shebangfix ssl diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message index 7c2cf9f6901a..d2ccd686e187 100644 --- a/net/ceph14/pkg-message +++ b/net/ceph14/pkg-message @@ -2,19 +2,32 @@ { type: install message: <> /etc/sysctl.conf + +Ceph comes with a web based dashboard that cannot be build +into a packagei. But the user can it himselfi from a ready-made RPM. + +To install the dashboard, please execute (as root): + + mkdir -p /usr/local/share/ceph/mgr/dashboard pkg install rpm2cpio + cd /tmp fetch http://download.ceph.com/rpm-nautilus/el8/noarch/ceph-mgr-dashboard-14.2.22-0.el8.noarch.rpm - rpm2cpio ${DISTDIR}/ceph-mgr-dashboard-${DISTVERSION}-0.el7.noarch.rpm | \ - ( cd ${WRKDIR}/dashboard; cpio -divm ) - chown -R ceph:ceph . - chown -R ceph:ceph /var/lib/ceph - + rpm2cpio ./ceph-mgr-dashboard-${DISTVERSION}-0.el8.noarch.rpm | cpio -divm + cd /tmp/usr/share/ceph/mgr/dashboard + rsync -vra . /usr/local/share/ceph/mgr/dashboard/ + chown -R ceph:ceph /usr/local/share/ceph/mgr/dashboard/ + chown -R ceph:ceph /var/lib/ceph /var/run/ceph /var/log/ceph EOM } ]