diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-15 14:27:35 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-16 16:16:16 -0700 |
| commit | 10b466e945358fbab72d123f0774d4f1d1ef9668 (patch) | |
| tree | 11974fc318771e3052e83ee38f2ac43f03d31290 | |
| parent | 5c476277a61902a002401d1655789a87037bc5ac (diff) | |
| download | ceph-10b466e945358fbab72d123f0774d4f1d1ef9668.tar.gz | |
radosgw: create /var/log/radosgw in package, not init script
Fixes: #6475
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | ceph.spec.in | 8 | ||||
| -rw-r--r-- | debian/radosgw.dirs | 2 | ||||
| -rw-r--r-- | src/init-radosgw | 8 | ||||
| -rw-r--r-- | src/init-radosgw.sysv | 8 |
4 files changed, 8 insertions, 18 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index ee4b84ef090..d6cc6309d8c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -365,7 +365,7 @@ fi %endif # Package removal cleanup if [ "$1" -eq "0" ] ; then - rm -rf /var/log/ceph + rm -rf /var/log/ceph rm -rf /etc/ceph fi @@ -516,6 +516,7 @@ fi %{_mandir}/man8/radosgw.8* %{_mandir}/man8/radosgw-admin.8* %{_sbindir}/rcceph-radosgw +%dir %{_localstatedir}/log/radosgw/ %post radosgw /sbin/ldconfig @@ -534,6 +535,11 @@ fi %restart_on_update ceph-radosgw %insserv_cleanup %endif +# Package removal cleanup +if [ "$1" -eq "0" ] ; then + rm -rf /var/log/radosgw +fi + ################################################################################# %if %{with ocf} diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs index effc2504987..d202a8c300c 100644 --- a/debian/radosgw.dirs +++ b/debian/radosgw.dirs @@ -1,2 +1,2 @@ -var/log/ceph +var/log/radosgw var/lib/ceph/radosgw diff --git a/src/init-radosgw b/src/init-radosgw index de1e01e0018..1468c4bcdfd 100644 --- a/src/init-radosgw +++ b/src/init-radosgw @@ -18,19 +18,11 @@ PREFIX='client.radosgw.' # user to run radosgw as (it not specified in ceph.conf) DEFAULT_USER='www-data' -# directory to write logs to -LOGDIR='/var/log/radosgw' - RADOSGW=`which radosgw` if [ ! -x "$RADOSGW" ]; then exit 0 fi -# make sure log dir exists -if [ ! -d "$LOGDIR" ]; then - mkdir -p $LOGDIR -fi - case "$1" in start) for name in `ceph-conf --list-sections $PREFIX`; diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv index 017e3f9bc07..cba99aff18f 100644 --- a/src/init-radosgw.sysv +++ b/src/init-radosgw.sysv @@ -20,19 +20,11 @@ PREFIX='client.radosgw.' #DEFAULT_USER='www-data' DEFAULT_USER='apache' -# directory to write logs to -LOGDIR='/var/log/radosgw' - RADOSGW=`which radosgw` if [ ! -x "$RADOSGW" ]; then exit 0 fi -# make sure log dir exists -if [ ! -d "$LOGDIR" ]; then - mkdir -p $LOGDIR -fi - case "$1" in start) echo "Starting radosgw instance(s)..." |