GlusterFS-3.3.1

This commit is contained in:
Kaleb S. KEITHLEY 2012-10-11 15:03:38 -04:00
parent 7b6c4bb1f9
commit dfd4d47d29
3 changed files with 43 additions and 16 deletions

1
.gitignore vendored
View File

@ -13,4 +13,5 @@ glusterfs-3.2.5.tar.gz
glusterfs-3.2.6.tar.gz
glusterfs-3.2.7.tar.gz
glusterfs-3.3.0.tar.gz
glusterfs-3.3.1.tar.gz
swift-1.4.8.tar.gz

View File

@ -31,13 +31,14 @@
Summary: Cluster File System
Name: glusterfs
Version: 3.3.0
Release: 11%{?dist}
Version: 3.3.1
Release: 1%{?dist}
License: GPLv3+ and (GPLv2 or LGPLv3+)
Group: System Environment/Base
Vendor: Red Hat
URL: http://www.gluster.org//docs/index.php/GlusterFS
Source0: http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/glusterfs-%{version}.tar.gz
#Source0: http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/glusterfs-%{version}.tar.gz
Source0: http://bits.gluster.com/pub/gluster/glusterfs/src/glusterfs-%{version}.tar.gz
Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig
Source3: umount.glusterfs
@ -580,7 +581,9 @@ cd ..
%if 0%{!?_without_georeplication:1}
%post geo-replication
#restart glusterd.
%{_sysconfdir}/init.d/glusterd restart &> /dev/null
if [ $1 -ge 1 ]; then
%_init_restart glusterd
fi
%files geo-replication
%defattr(-,root,root)
@ -797,13 +800,19 @@ fi
%preun server
if [ $1 -eq 0 ]; then
%_init_stop glusterfsd
if [ -f %_init_file2 ]; then
%_init_stop glusterfsd
fi
%_init_stop glusterd
%_init_disable glusterfsd
if [ -f %_init_file2 ]; then
%_init_disable glusterfsd
fi
%_init_disable glusterd
fi
if [ $1 -ge 1 ]; then
%_init_restart glusterfsd
if [ -f %_init_file2 ]; then
%_init_restart glusterfsd
fi
%_init_restart glusterd
fi
@ -816,8 +825,7 @@ useradd -r -g swift -u 160 -d %{_sharedstatedir}/swift -s /sbin/nologin \
-c "OpenStack Swift Daemons" swift
exit 0
%post swift-account
/sbin/chkconfig --add gluster-swift-account
%pre swift-account
if [ -f /etc/swift/account-server/1.conf ]; then
echo "warning: /etc/swift/account-server/1.conf saved as /etc/swift/account-server/1.conf.rpmsave"
@ -825,6 +833,10 @@ if [ -f /etc/swift/account-server/1.conf ]; then
fi
%post swift-account
/sbin/chkconfig --add gluster-swift-account
%preun swift-account
if [ $1 = 0 ] ; then
/sbin/service gluster-swift-account stop >/dev/null 2>&1
@ -838,8 +850,7 @@ if [ "$1" -ge "1" ] ; then
fi
%post swift-container
/sbin/chkconfig --add gluster-swift-container
%pre swift-container
if [ -f /etc/swift/container-server/1.conf ]; then
echo "warning: /etc/swift/container-server/1.conf saved as /etc/swift/container-server/1.conf.rpmsave"
@ -847,6 +858,10 @@ if [ -f /etc/swift/container-server/1.conf ]; then
fi
%post swift-container
/sbin/chkconfig --add gluster-swift-container
%preun swift-container
if [ $1 = 0 ] ; then
/sbin/service gluster-swift-container stop >/dev/null 2>&1
@ -860,8 +875,7 @@ if [ "$1" -ge "1" ] ; then
fi
%post swift-object
/sbin/chkconfig --add gluster-swift-object
%pre swift-object
if [ -f /etc/swift/object-server/1.conf ]; then
echo "warning: /etc/swift/object-server/1.conf saved as /etc/swift/object-server/1.conf.rpmsave"
@ -869,6 +883,10 @@ if [ -f /etc/swift/object-server/1.conf ]; then
fi
%post swift-object
/sbin/chkconfig --add gluster-swift-object
%preun swift-object
if [ $1 = 0 ] ; then
/sbin/service gluster-swift-object stop >/dev/null 2>&1
@ -882,8 +900,7 @@ if [ "$1" -ge "1" ] ; then
fi
%post swift-proxy
/sbin/chkconfig --add gluster-swift-proxy
%pre swift-proxy
if [ -f /etc/swift/proxy-server.conf ]; then
echo "warning: /etc/swift/proxy-server.conf saved as /etc/swift/proxy-server.conf.rpmsave"
@ -891,6 +908,10 @@ if [ -f /etc/swift/proxy-server.conf ]; then
fi
%post swift-proxy
/sbin/chkconfig --add gluster-swift-proxy
%preun swift-proxy
if [ $1 = 0 ] ; then
/sbin/service gluster-swift-proxy stop >/dev/null 2>&1
@ -906,6 +927,11 @@ fi
%changelog
* Mon Oct 11 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-1
- GlusterFS-3.3.1
- save swift .conf files correctly during upgrade
- fix glusterd restart in %post geo-replication
* Wed Sep 19 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-11
- condrestart glusterfsd then glusterd in %preun server

View File

@ -1,2 +1,2 @@
3ddf782421f54c60b9da9607b0c32ec1 glusterfs-3.3.0.tar.gz
4c9f291de887b1193d5d1acac4003360 glusterfs-3.3.1.tar.gz
785ae9ba4e1f6fc256cd6a697bb2861f swift-1.4.8.tar.gz