From nobody Tue Feb 01 15:28:26 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 1A75B198D884; Tue, 1 Feb 2022 15:28:27 +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 4Jp82y6FTkz3Jf3; Tue, 1 Feb 2022 15:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729307; 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=bcH11GaMbxnWYerFW3Zpq1IhsEFgZ1KLTpehsrzCJZs=; b=yWy076lBiRUVfj9XnRGVyefVPY+8l3Wrb8skv0tfJpHUBaEh9XhYahoNL+J5CzRVRPsxyb ZKkrrLX+D4zd4+YI4XijuAGN0WcDRdUpFqg4huWIsgqTudphfd2yNROMDZP1p5brMulF3K yUou/8dHCp4j4Y+bBtwCyALAc9wFvPlixx/s+RYj+wemQs5+uhV4PpwnUHeI3kOiwivxEP 7GBcskLd/lzw/cu8LKL76reH2OAzEukvTohRhws/GjbMY59w1cgAqqXZSi9ypJ4lBKownr 7NjaL8XXLBz6YwXjGW8g4tG7HVJpc8hd+5LxtoNrHo6uIPOV13J2RrY/aHZkGw== 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 B60C013429; Tue, 1 Feb 2022 15:28:26 +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 211FSQaJ051955; Tue, 1 Feb 2022 15:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211FSQvq051954; Tue, 1 Feb 2022 15:28:26 GMT (envelope-from git) Date: Tue, 1 Feb 2022 15:28:26 GMT Message-Id: <202202011528.211FSQvq051954@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: d8898119e91f - 2022Q1 - 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: d8898119e91f92d808bb2f4b0057f97736d826c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643729307; 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=bcH11GaMbxnWYerFW3Zpq1IhsEFgZ1KLTpehsrzCJZs=; b=TLFJ7lwphtHKhnfvKHGCSK2HklttBkTEzGie871HTmlUeIPLpORMsMC7kjn5FtiQIbum1D zASX+vgz9mhB+p+7rbZOfp/89w2b2x4uFz+cnwMy702Q2owbKkg9Q9Q2+Z9UYlPRFltHww Cqwiucl6mA5ND2aMtATHCHwSR3/c4TDc086C1s5rOxup6nvBrR6DfLo5R9mmvQ0Q9nra2F mD8VQmk+q8ZIDdvV5doq6lOD1tWyoLkUOiwVjNNUtNnOxI8qoNWsXSMuPoeApbvyVyjVkY VX75z0JI3khh07bZDaN2g0GK1ftPRX93zAIMUF534uWysonSBwpcbwyZyhWqdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643729307; a=rsa-sha256; cv=none; b=jxIkOuzBLApYB+mqC103BQSrnrX7fwYNyzj0381uP/MW5cy9Rv9DJnDBR3Aj+17KJmuzLH 8tO0mRIweu6W/GOtR5huFvUTyWn7NvOLyM9C5HNztZOORaksVu60vy5uVwB+GDfLV/H5b1 ByODthOjaHH7l30DCB7ZBA55fXzTWGIdC9VQtYGfdm5OzlMoojDWHgfD2ilPO6PXieFuMq PzQhdE5Djw7QUC/X9pK9c+MBhvzVjO5pTJUwDbhKzwPbIUf5pfsZSSD7yvhO7hqXI4uHPO cygkxOdKPeLM+1PO6j9QxYPfBCRChVGXaw0qr1KhwgctL99dyRGAiHnucfXqTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8898119e91f92d808bb2f4b0057f97736d826c0 commit d8898119e91f92d808bb2f4b0057f97736d826c0 Author: Dima Panov AuthorDate: 2022-02-01 15:22:15 +0000 Commit: Dima Panov CommitDate: 2022-02-01 15:28:04 +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. (cherry picked from commit c2f30dc007f6818732c4a12b15955568bc7a66bc) --- net/ceph14/Makefile | 5 +++-- net/ceph14/pkg-message | 33 +++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index c0372e8dc7d1..4720f76f0aae 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -3,6 +3,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v DISTVERSION= 14.2.22 +PORTREVISION= 1 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -50,6 +51,7 @@ 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}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \ @@ -57,8 +59,7 @@ RUN_DEPENDS= \ ${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 } ]