Merge pull request #722 from ceph/wip-6475

radosgw: create /var/log/radosgw in package, not init script

Reviewed-and-tested-by: Gary Lowell <gary.lowell@inktank.com>

4 files changed, 9 insertions, 19 deletions

diff --git a/ceph.spec.in b/ceph.spec.in
index 1c65957b42d..d8c62d2096a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -328,7 +328,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/osd
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/mds
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-osd
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds
-
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw
 
 %if %{defined suse_version}
 # Fedora seems to have some problems with this macro, use it only on SUSE
@@ -364,7 +364,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
 
@@ -515,6 +515,7 @@ fi
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/radosgw-admin.8*
 %{_sbindir}/rcceph-radosgw
+%dir %{_localstatedir}/log/radosgw/
 
 %post radosgw
 /sbin/ldconfig
@@ -533,6 +534,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)..."