radosgw: log to /var/log/ceph instead of /var/log/radosgw

This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index c068af6a4268c82739507bee131503a8fa4ae4aa..c3c06e7192d962399fb9b4cd4c1e253dd098b652 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -25,8 +25,7 @@ restorecon -R /etc/rc\.d/init\.d/ceph > /dev/null 2>&1; \
 restorecon -R /etc/rc\.d/init\.d/radosgw > /dev/null 2>&1; \
 restorecon -R /var/run/ceph > /dev/null 2>&1; \
 restorecon -R /var/lib/ceph > /dev/null 2>&1; \
-restorecon -R /var/log/ceph > /dev/null 2>&1; \
-restorecon -R /var/log/radosgw > /dev/null 2>&1;
+restorecon -R /var/log/ceph > /dev/null 2>&1;
 %endif
 
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
@@ -611,7 +610,6 @@ install -m 0644 -D etc/sysconfig/ceph $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ce
 %endif
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
-install -m 0644 -D src/rgw/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/radosgw
 chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf
 chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config
 
@@ -651,7 +649,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/radosgw
 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}/lib/ceph/bootstrap-rgw
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw
 
 %if 0%{?suse_version}
 # Fedora seems to have some problems with this macro, use it only on SUSE
@@ -910,9 +907,7 @@ fi
 %{_bindir}/radosgw-object-expirer
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/radosgw-admin.8*
-%config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
-%dir %{_localstatedir}/log/radosgw/
 %dir %{_localstatedir}/lib/ceph/radosgw
 %if 0%{?_with_systemd}
 %else
@@ -951,10 +946,6 @@ fi
     done
   fi
 %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 d202a8c300cf2fa994e793e86e92cf243cd7f1bc..a2f1849122bc8f9f4b78add2ce6ea91ae71b1731 100644 (file)
--- a/debian/radosgw.dirs
+++ b/debian/radosgw.dirs
@@ -1,2 +1 @@
-var/log/radosgw
 var/lib/ceph/radosgw

diff --git a/debian/rules b/debian/rules
index 95fdfbd4545247ab837f0c796795e923b47cf90d..69ad8c88ba1fc8b49d753cf144148018b469077d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,6 @@ build-stamp: configure-stamp
        cp src/init-ceph debian/ceph.init
        cp src/init-radosgw debian/radosgw.init
        cp src/logrotate.conf debian/ceph.logrotate
-       cp src/rgw/logrotate.conf debian/radosgw.logrotate
 
        touch $@
 

diff --git a/doc/man/8/radosgw.rst b/doc/man/8/radosgw.rst
index 1f74dec6d0b7be16d589e28076ea8b1e79260f83..f57b34679d5c6ef9f370a5034d3ceb8f5957342c 100644 (file)
--- a/doc/man/8/radosgw.rst
+++ b/doc/man/8/radosgw.rst
@@ -101,7 +101,7 @@ tcp and through unix domain socket:
        host = {hostname}
        keyring = /etc/ceph/ceph.client.radosgw.keyring
        rgw socket path = ""
-       log file = /var/log/radosgw/client.radosgw.gateway.log
+       log file = /var/log/ceph/client.radosgw.gateway.log
        rgw frontends = fastcgi socket_port=9000 socket_host=0.0.0.0
        rgw print continue = false
 
@@ -156,7 +156,7 @@ tcp and through unix domain socket:
        host = {hostname}
        keyring = /etc/ceph/ceph.client.radosgw.keyring
        rgw socket path = /var/run/ceph/ceph.radosgw.gateway.fastcgi.sock
-       log file = /var/log/radosgw/client.radosgw.gateway.log
+       log file = /var/log/ceph/client.radosgw.gateway.log
        rgw print continue = false
 
 #. Add the following content in the gateway configuration file:

diff --git a/selinux/ceph.fc b/selinux/ceph.fc
index 31926895c465b5692c67fa801c89205c016f353e..6b8d06254e8f0c63472337ba8a42f10da6a99e80 100644 (file)
--- a/selinux/ceph.fc
+++ b/selinux/ceph.fc
@@ -9,6 +9,5 @@
 /var/lib/ceph(/.*)?            gen_context(system_u:object_r:ceph_var_lib_t,s0)
 
 /var/log/ceph(/.*)?            gen_context(system_u:object_r:ceph_log_t,s0)
-/var/log/radosgw(/.*)?         gen_context(system_u:object_r:ceph_log_t,s0)
 
 /var/run/ceph(/.*)?            gen_context(system_u:object_r:ceph_var_run_t,s0)

diff --git a/selinux/ceph_selinux.8 b/selinux/ceph_selinux.8
index 6e91a212725e06e850a3227edf9c0ad2082fb5a3..a646374bd55062c7574a30c345206acec2855480 100644 (file)
--- a/selinux/ceph_selinux.8
+++ b/selinux/ceph_selinux.8
@@ -170,8 +170,6 @@ The SELinux process type ceph_t can manage files labeled with the following file
 
        /var/log/ceph(/.*)?
 .br
-       /var/log/radosgw(/.*)?
-.br
 
 .br
 .B ceph_var_lib_t
@@ -321,7 +319,7 @@ Paths:
 .br
 .TP 5
 Paths:
-/var/log/ceph(/.*)?, /var/log/radosgw(/.*)?
+/var/log/ceph(/.*)?
 
 .EX
 .PP
@@ -369,4 +367,4 @@ This manual page was auto-generated using
 
 .SH "SEE ALSO"
 selinux(8), ceph(8), semanage(8), restorecon(8), chcon(1), sepolicy(8)
-, setsebool(8)
\ No newline at end of file
+, setsebool(8)

diff --git a/src/logrotate.conf b/src/logrotate.conf
index 014ce4532b088b27a2cf0bce7958f166ca1c2663..08ad4b4c1097841ef65aab852be41b31be125b33 100644 (file)
--- a/src/logrotate.conf
+++ b/src/logrotate.conf
@@ -4,7 +4,7 @@
     compress
     sharedscripts
     postrotate
-        killall -q -1 ceph-mon ceph-mds ceph-osd || true
+        killall -q -1 ceph-mon ceph-mds ceph-osd radosgw || true
     endscript
     missingok
     notifempty

diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 9e330a1cdb04552073e903ee489bad8b659f2fd8..3a30156c298030f7d4e45b13bf655350c47888d7 100644 (file)
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -124,7 +124,6 @@ bin_DEBUGPROGRAMS += ceph_rgw_jsonparser
 
 
 noinst_HEADERS += \
-       rgw/logrotate.conf \
        rgw/rgw_acl.h \
        rgw/rgw_acl_s3.h \
        rgw/rgw_acl_swift.h \

diff --git a/src/rgw/logrotate.conf b/src/rgw/logrotate.conf
deleted file mode 100644 (file)
index 036b85b..0000000
--- a/src/rgw/logrotate.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/radosgw/*.log {
-    rotate 7
-    daily
-    compress
-    sharedscripts
-    postrotate
-        killall -q -1 radosgw || true
-    endscript
-    missingok
-    notifempty
-    su ceph ceph
-}

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 7a9b32793b1906fae78bb120c9af0f5b75adca1a..c6ba1c210fb9d0a893759be7becf6f8c110a799a 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1028,7 +1028,6 @@ int main(int argc, const char **argv)
   vector<const char *> def_args;
   def_args.push_back("--debug-rgw=1/5");
   def_args.push_back("--keyring=$rgw_data/keyring");
-  def_args.push_back("--log-file=/var/log/radosgw/$cluster-$name.log");
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);