From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F077C138239 for ; Mon, 25 Mar 2019 23:59:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4D67E0848; Mon, 25 Mar 2019 23:59:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64D70E0848 for ; Mon, 25 Mar 2019 23:59:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC0DF335C9C for ; Mon, 25 Mar 2019 23:59:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72D44A8 for ; Mon, 25 Mar 2019 23:59:41 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1553558363.0e8b3bbc6b59171c3dc6190ad4b54530b8768399.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/files/ceph.initd-r10 sys-cluster/ceph/files/ceph.initd-r8 sys-cluster/ceph/files/ceph.logrotate-r1 X-VCS-Directories: sys-cluster/ceph/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 0e8b3bbc6b59171c3dc6190ad4b54530b8768399 X-VCS-Branch: master Date: Mon, 25 Mar 2019 23:59:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1c9317c-741d-4ca1-8c74-cb33ab12f4c4 X-Archives-Hash: 36183acd140d00c9c9bed5a999c9a7b7 commit: 0e8b3bbc6b59171c3dc6190ad4b54530b8768399 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Mar 25 18:12:52 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Mar 25 23:59:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8b3bbc sys-cluster/ceph: remove unused files Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11498 Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/files/ceph.initd-r10 | 108 ------------------------------- sys-cluster/ceph/files/ceph.initd-r8 | 95 --------------------------- sys-cluster/ceph/files/ceph.logrotate-r1 | 18 ------ 3 files changed, 221 deletions(-) diff --git a/sys-cluster/ceph/files/ceph.initd-r10 b/sys-cluster/ceph/files/ceph.initd-r10 deleted file mode 100644 index 2f5150fc340..00000000000 --- a/sys-cluster/ceph/files/ceph.initd-r10 +++ /dev/null @@ -1,108 +0,0 @@ -#!/sbin/openrc-run - -ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" -extra_commands="reload" -daemon_type="${RC_SVCNAME#ceph-}" -daemon_type="${daemon_type%%.*}" -daemon_id="${RC_SVCNAME#ceph-*.}" -daemon_id="${daemon_id:-0}" -: ${rundir:=/run/ceph} -: ${user:=ceph} -: ${group:=ceph} -: ${rc_ulimit:=-n 1048576 -u 1048576} - -pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" -daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" - -command="/usr/bin/${RC_SVCNAME%%.*}" -command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" -command_args_foreground="--foreground" - -retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" -start_stop_daemon_args="--user ${user} --group ${group}" -supervise_daemon_args="--user ${user} --group ${group}" - -: ${supervisor:=supervise-daemon} -: ${stdout:=/var/log/ceph/ceph} -: ${stderr:=/var/log/ceph/ceph} -: ${respawn_delay:=10} -: ${respawn_max:=5} -: ${respawn_period:=1800} - -: ${osd_respawn_delay:=15} -: ${osd_respawn_max:=10} - -: ${radosgw_respawn_max:=5} -: ${radosgw_respawn_period:=30} - -depend() { - use dns logger - after net ntpd ntp-client chronyd - before netmount -} - -is_type_valid() { - case ${daemon_type} in - mon|mds|osd|mgr|radosgw) return 0;; - *) return 1;; - esac -} - -start_pre() { - local logdir - export CEPH_CONF="${ceph_conf}" - - checkpath -d -q -o "${user}:${group}" "${rundir}" - - if ! is_type_valid ;then - eerror "Please give valid Ceph Server Type: mds, mon, osd" - return 1 - - elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then - eerror "${daemon_type}.${daemon_id} is still running, refusing to start" - return 1 - fi - - if [ -n "${bluestore_osd_fsid}" ]; then - einfo "Mounting Bluestore" - ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd - fi - - if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then - command_args="${command_args} --name client.${daemon_id}" - fi - - local arg_name arg_val - for arg_name in std{out,err} respawn_{delay,max,period}; do - eval arg_val="\${${daemon_type}_${arg_name}}" - - if [ -z "${arg_val}" ]; then - eval arg_val="\${${arg_name}}" - else - eval "${arg_name}=\"${arg_val}\"" - fi - - if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then - local log_file log_postfix - log_postfix=".${daemon_id}-${arg_name}.log" - log_file="${arg_val}" - - if [ "${log_file}" != /dev/null ]; then - log_file="${log_file}${log_postfix}" - fi - - log_dir="$(dirname "${log_file}")" - checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}" - - supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" - fi - done -} - -reload() { - ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" - start-stop-daemon --signal 1 "${start_stop_daemon_args}" - eend ${?} -} - -# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/files/ceph.initd-r8 b/sys-cluster/ceph/files/ceph.initd-r8 deleted file mode 100644 index 2ef2ed1890d..00000000000 --- a/sys-cluster/ceph/files/ceph.initd-r8 +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/openrc-run - -ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}" -extra_commands="reload" -daemon_type="${RC_SVCNAME#ceph-}" -daemon_type="${daemon_type%%.*}" -daemon_id="${RC_SVCNAME#ceph-*.}" -daemon_id="${daemon_id:-0}" -: ${rundir:=/run/ceph} -: ${user:=ceph} -: ${group:=ceph} -: ${rc_ulimit:=-n 1048576 -u 1048576} - -pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" -daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" - -command="/usr/bin/${RC_SVCNAME%%.*}" -command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" -command_args_foreground="--foreground" - -retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" -start_stop_daemon_args="--user ${user} --group ${group}" -supervise_daemon_args="--user ${user} --group ${group}" - -: ${supervisor:=supervise-daemon} -: ${stdout:=/var/log/ceph/ceph} -: ${stderr:=/var/log/ceph/ceph} -: ${respawn_delay:=10} -: ${respawn_max:=5} -: ${respawn_period:=1800} - -: ${osd_respawn_delay:=15} -: ${osd_respawn_max:=10} - -: ${radosgw_respawn_max:=5} -: ${radosgw_respawn_period:=30} - -depend() { - use dns logger - after net ntpd ntp-client chronyd - before netmount -} - -is_type_valid() { - case ${daemon_type} in - mon|mds|osd|mgr|radosgw) return 0;; - *) return 1;; - esac -} - -start_pre() { - export CEPH_CONF="${ceph_conf}" - - checkpath -d -q -o "${user}:${group}" "${rundir}" - - if ! is_type_valid ;then - eerror "Please give valid Ceph Server Type: mds, mon, osd" - return 1 - - elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then - eerror "${daemon_type}.${daemon_id} is still running, refusing to start" - return 1 - fi - - local arg_name arg_val - for arg_name in std{out,err} respawn_{delay,max,period}; do - eval arg_val="\${${daemon_type}_${arg_name}}" - - if [ -z "${arg_val}" ]; then - eval arg_val="\${${arg_name}}" - else - eval "${arg_name}=\"${arg_val}\"" - fi - - if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then - local log_file log_postfix - log_postfix=".${daemon_id}-${arg_name}.log" - log_file="${arg_val}" - - if [ "${log_file}" != /dev/null ]; then - log_file="${log_file}${log_postfix}" - fi - - supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${log_file}" - fi - done -} - -reload() { - ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" - start-stop-daemon --signal 1 "${start_stop_daemon_args}" - eend ${?} -} - -# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/files/ceph.logrotate-r1 b/sys-cluster/ceph/files/ceph.logrotate-r1 deleted file mode 100644 index df03f5e69a4..00000000000 --- a/sys-cluster/ceph/files/ceph.logrotate-r1 +++ /dev/null @@ -1,18 +0,0 @@ -/var/log/ceph/*.log -{ - rotate 7 - daily - compress - sharedscripts - prerotate - for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do - ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null - done - endscript - postrotate - for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do - ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null - done - endscript - missingok -}