aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDima Panov <fluffy@FreeBSD.org>2022-02-01 15:22:15 +0000
committerDima Panov <fluffy@FreeBSD.org>2022-02-01 15:28:04 +0000
commitd8898119e91f92d808bb2f4b0057f97736d826c0 (patch)
treee581b7caa64bf347440af4ecf6b99c25f32dd452 /net
parent214299fa23832ad75506653d9f18b2c285103a33 (diff)
downloadports-d8898119e91f92d808bb2f4b0057f97736d826c0.tar.gz
ports-d8898119e91f92d808bb2f4b0057f97736d826c0.zip
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)
Diffstat (limited to 'net')
-rw-r--r--net/ceph14/Makefile5
-rw-r--r--net/ceph14/pkg-message33
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: <<EOM
This package has installed ceph14, called nautilus.
-It comes with a web based dashboard that cannot be build
-into a package but will require the user to install it himself.
-To install the dashboard, please execute:
- as root execute:
- cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
+To be able to run Ceph, the following setup changes are needed:
+
+ - Mount linux compat filesystem, add to /etc/fstab:
+ # required by ceph
+ linprocfs /compat/linux/proc linprocfs rw 0 0
+ linsysfs /compat/linux/sys linsysfs rw 0 0
+ fdescfs /compat/linux/dev/fd fdescfs rw,linrdlnk 0 0
+
+ - Shorten the WAIT2 time for TCP teardown
+ echo "net.inet.tcp.msl=3000" >> /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
}
]