From de026f15f80aa0e83f98960a2e3a3c29f6783d05 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 9 Jun 2017 11:24:37 -0400 Subject: [PATCH] ceph.spec,debian: remove auto-generated self-signed mgr restful cert Signed-off-by: Sage Weil --- ceph.spec.in | 8 -------- debian/ceph-mgr.postinst | 7 ------- debian/control | 1 - 3 files changed, 16 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 277e376d748..59751d44624 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -331,7 +331,6 @@ Requires: python-CherryPy Requires: python-Werkzeug %endif Requires: python-pecan -Requires(post): openssl %description mgr ceph-mgr enables python modules that provide services (such as the REST module derived from Calamari) and expose CLI hooks. ceph-mgr gathers @@ -1182,13 +1181,6 @@ fi %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mgr %post mgr -CERT="%{_sysconfdir}/ceph/ceph-mgr-restful.crt" -PKEY="%{_sysconfdir}/ceph/ceph-mgr-restful.key" -if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then - openssl req -new -nodes -x509 \ - -subj "/O=IT/CN=ceph-mgr-restful" \ - -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca -fi %if 0%{?suse_version} if [ $1 -eq 1 ] ; then /usr/bin/systemctl preset ceph-mgr@\*.service ceph-mgr.target >/dev/null 2>&1 || : diff --git a/debian/ceph-mgr.postinst b/debian/ceph-mgr.postinst index d483d4dccf3..6d38ccf09fe 100644 --- a/debian/ceph-mgr.postinst +++ b/debian/ceph-mgr.postinst @@ -24,13 +24,6 @@ set -e case "$1" in configure) - CERT="/etc/ceph/ceph-mgr-restful.crt" - PKEY="/etc/ceph/ceph-mgr-restful.key" - if [ ! -e "$CERT" -o ! -e "$PKEY" ]; then - openssl req -new -nodes -x509 \ - -subj "/O=IT/CN=ceph-mgr-restful" \ - -days 3650 -keyout "$PKEY" -out "$CERT" -extensions v3_ca - fi [ -x /sbin/start ] && start ceph-mgr-all || : if ! dpkg-statoverride --list /var/lib/ceph/mgr >/dev/null diff --git a/debian/control b/debian/control index 4b70d2fa7b9..cc3009f8738 100644 --- a/debian/control +++ b/debian/control @@ -163,7 +163,6 @@ Architecture: linux-any Depends: ceph-base (= ${binary:Version}), python-pecan, python-werkzeug, - openssl, ${misc:Depends}, ${python:Depends}, python-cherrypy3,