diff options
| author | Bala.FA <barumuga@redhat.com> | 2013-08-09 17:21:56 +0530 | 
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-08-13 07:08:21 -0700 | 
| commit | e75071a5eee1a69caac4d0477f5458ddfe776f07 (patch) | |
| tree | fe558086ecf8d2842e74a4e3343b4b04354edc23 /glusterfs.spec.in | |
| parent | e3f2d5fb1e8a12317959748eee15d4ec1f8f3fa6 (diff) | |
log: add rsyslog gluster configuration file
This patch comes with rsyslog gluster configuration file for fedora
and rhel >= 6.  It disables syslog at rpm build time if targetted
platform is rhel < 6 as there is no rsyslog support.
Change-Id: I95c076874b6891ff08dee1b35980f95529fb0f37
BUG: 928648
Signed-off-by: Bala.FA <barumuga@redhat.com>
Reviewed-on: http://review.gluster.org/5543
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 30 | 
1 files changed, 30 insertions, 0 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c2ef6d1473f..9308a641f80 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -35,6 +35,11 @@  # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without syslog  %{?_without_syslog:%global _without_syslog --disable-syslog} +# disable syslog forcefully as rhel < 6 doesn't have rsyslog +%if ( 0%{?rhel} && 0%{?rhel} < 6 ) +%global _without_syslog --disable-syslog +%endif +  # there is no systemtap support! Perhaps some day there will be  %global _without_systemtap --enable-systemtap=no @@ -175,6 +180,12 @@ both GlusterFS server and client framework.  %package libs  Summary:          GlusterFS common libraries  Group:            Applications/File +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +Requires:         rsyslog-mmjsonparse +%endif +%if ( 0%{?rhel} && 0%{?rhel} == 6 ) +Requires:         rsyslog-mmcount +%endif  %description libs  GlusterFS is a clustered file-system capable of scaling to several @@ -485,6 +496,16 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha  touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf  %endif +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) +%{__install} -D -p -m 0644 extras/gluster-rsyslog-7.2.conf \ +    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf +%endif + +%if ( 0%{?rhel} && 0%{?rhel} == 6 ) +%{__install} -D -p -m 0644 extras/gluster-rsyslog-5.8.conf \ +    %{buildroot}%{_sysconfdir}/rsyslog.d/gluster.conf +%endif +  # the rest of the ghosts  touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info  touch %{buildroot}%{_sharedstatedir}/glusterd/options @@ -564,12 +585,21 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid  %post libs  /sbin/ldconfig +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%_init_restart rsyslog +%endif  %postun libs  /sbin/ldconfig +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%_init_restart rsyslog +%endif  %files libs  %{_libdir}/*.so.* +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%{_sysconfdir}/rsyslog.d/gluster.conf +%endif  %exclude %{_libdir}/libgfapi.*  %files cli  | 
