|
 |
e7a346 |
From 8b9f3413dfc9f319f5d7476132bbbfa390819f26 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Date: Wed, 28 Feb 2018 09:17:09 +0530
|
|
|
e7a346 |
Subject: [PATCH 173/180] packaging : adding missed part from 5eed664 while
|
|
|
e7a346 |
backporting to downstream
|
|
|
e7a346 |
|
|
|
e7a346 |
Label : DOWNSTREAM ONLY
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: I0ece0adb3b2c85a5ced9c1850ee783d8952a8dec
|
|
|
e7a346 |
BUG: 1472445
|
|
|
e7a346 |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/131344
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
glusterfs.spec.in | 11 ++++++++++-
|
|
|
e7a346 |
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
e7a346 |
index 8379f64..ca36e65 100644
|
|
|
e7a346 |
--- a/glusterfs.spec.in
|
|
|
e7a346 |
+++ b/glusterfs.spec.in
|
|
|
e7a346 |
@@ -826,8 +826,13 @@ install -D -p -m 0644 extras/glusterfs-logrotate \
|
|
|
e7a346 |
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
|
|
|
e7a346 |
|
|
|
e7a346 |
# ganesha ghosts
|
|
|
e7a346 |
+%if ( ! 0%{?_build_server} )
|
|
|
e7a346 |
mkdir -p %{buildroot}%{_sysconfdir}/ganesha
|
|
|
e7a346 |
touch %{buildroot}%{_sysconfdir}/ganesha/ganesha-ha.conf
|
|
|
e7a346 |
+mkdir -p %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/exports
|
|
|
e7a346 |
+touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
|
|
|
e7a346 |
+touch %{buildroot}%{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
|
|
|
e7a346 |
+%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%if ( 0%{!?_without_georeplication:1} )
|
|
|
e7a346 |
mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
|
|
|
e7a346 |
@@ -1342,7 +1347,11 @@ exit 0
|
|
|
e7a346 |
%{_prefix}/lib/ocf/resource.d/heartbeat/*
|
|
|
e7a346 |
%{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
|
|
|
e7a346 |
%{_sysconfdir}/ganesha/ganesha-ha.conf.sample
|
|
|
e7a346 |
-%ghost %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf
|
|
|
e7a346 |
+%ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/ganesha/ganesha-ha.conf
|
|
|
e7a346 |
+%ghost %dir %attr(0755,-,-) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha
|
|
|
e7a346 |
+%ghost %dir %attr(0755,-,-) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/exports
|
|
|
e7a346 |
+%ghost %attr(0644,-,-) %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha.conf
|
|
|
e7a346 |
+%ghost %attr(0644,-,-) %config(noreplace) %{_localstatedir}/run/gluster/shared_storage/nfs-ganesha/ganesha-ha.conf
|
|
|
e7a346 |
%endif
|
|
|
e7a346 |
|
|
|
e7a346 |
%if ( 0%{?_build_server} )
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|