From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 9 Aug 2007 22:02:23 -0000 Subject: [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ... Message-ID: <20070809220223.854.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL4 Changes by: rmccabe at sourceware.org 2007-08-09 22:02:22 Modified files: . : clustermon.spec.in.in conga.spec.in.in download_files make : version.in Added files: . : Plone-2.5.3-final_CMFPlone.patch Removed files: . : Plone-2.5.2-1_CMFPlone.patch Log message: Update spec files, and bump version numbers Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.3-final_CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=NONE&r2=1.2.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.5&r2=1.25.2.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.11&r2=1.67.2.12 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.2&r2=1.5.2.3 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Plone-2.5.2-1_CMFPlone.patch.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1&r2=NONE http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.5&r2=1.28.2.6 /cvs/cluster/conga/Plone-2.5.3-final_CMFPlone.patch,v --> standard output revision 1.2.2.1 --- conga/Plone-2.5.3-final_CMFPlone.patch +++ - 2007-08-09 22:02:22.562577000 +0000 @@ -0,0 +1,111 @@ +diff -ur Plone-2.5.3-final.orig/CMFPlone/exportimport/configure.zcml Plone-2.5.3-final/CMFPlone/exportimport/configure.zcml +--- Plone-2.5.3-final.orig/CMFPlone/exportimport/configure.zcml 2007-05-16 06:35:51.000000000 -0400 ++++ Plone-2.5.3-final/CMFPlone/exportimport/configure.zcml 2007-06-12 15:31:05.000000000 -0400 +@@ -32,12 +32,6 @@ + /> + + +- +- + +- +- +- +- +- +- + /dev/null` /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 -/sbin/service oddjobd reload > /dev/null 2>&1 -/sbin/chkconfig --add modclusterd +# It's ok if this fails (it will fail when oddjob is not running). +/sbin/service oddjobd reload > /dev/null 2>&1 || true %preun -n modcluster if [ "$1" == "0" ]; then - /sbin/service modclusterd stop > /dev/null 2>&1 - /sbin/chkconfig --del modclusterd + /sbin/service modclusterd stop > /dev/null 2>&1 + /sbin/chkconfig --del modclusterd fi %postun -n modcluster if [ "$1" == "0" ]; then - DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` - /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 - /sbin/service oddjobd reload > /dev/null 2>&1 + DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` + /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 + /sbin/service oddjobd reload > /dev/null 2>&1 fi if [ "$1" == "1" ]; then - /sbin/service modclusterd condrestart > /dev/null 2>&1 + /sbin/service modclusterd condrestart > /dev/null 2>&1 fi @@ -121,7 +122,7 @@ Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent Requires: modcluster = %{version}-%{release} -Requires: net-snmp +Requires: net-snmp Requires: oddjob openssl Requires(post): initscripts Requires(postun): initscripts @@ -138,13 +139,12 @@ %{_docdir}/cluster-snmp-%{version}/ %post -n cluster-snmp -/sbin/service snmpd condrestart > /dev/null 2>&1 -exit 0 +/sbin/service snmpd condrestart > /dev/null 2>&1 || true %postun -n cluster-snmp # don't restart snmpd twice on upgrades if [ "$1" == "0" ]; then - /sbin/service snmpd condrestart > /dev/null 2>&1 + /sbin/service snmpd condrestart > /dev/null 2>&1 fi @@ -159,14 +159,14 @@ Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider Requires: modcluster = %{version}-%{release} -Requires: tog-pegasus +Requires: tog-pegasus Requires: oddjob openssl Requires(post): initscripts Requires(postun): initscripts Conflicts: clumon-cim %description -n cluster-cim -CIM provider for Red Hat Enterprise Linux Cluster Suite. +CIM provider for Red Hat Enterprise Linux Cluster Suite. %files -n cluster-cim %defattr(-,root,root) @@ -174,14 +174,13 @@ %{_docdir}/cluster-cim-%{version}/ %post -n cluster-cim -/sbin/service tog-pegasus condrestart > /dev/null 2>&1 # pegasus might not be running, don't fail %post -exit 0 +/sbin/service tog-pegasus condrestart > /dev/null 2>&1 || true %postun -n cluster-cim # don't restart pegasus twice on upgrades if [ "$1" == "0" ]; then - /sbin/service tog-pegasus condrestart > /dev/null 2>&1 + /sbin/service tog-pegasus condrestart > /dev/null 2>&1 fi # pegasus might not be running, don't fail %postun exit 0 @@ -196,6 +195,9 @@ %changelog +* Thu Aug 09 2007 Ryan McCabe 0.11.0-1 +- Merge in fixes from the RHEL5 code base. + * Tue Apr 30 2007 Ryan McCabe 0.9.1-8 - Do not build for ppc64 - Related: bz236827 @@ -259,5 +261,5 @@ - Don't auto-start modclusterd after installation, do it manually * Wed Aug 09 2006 Stanko Kupcevic 0.8-11 -- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and +- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and cluster-cim) from conga.srpm --- conga/conga.spec.in.in 2007/05/02 02:39:53 1.67.2.11 +++ conga/conga.spec.in.in 2007/08/09 22:02:19 1.67.2.12 @@ -11,7 +11,7 @@ ############################################################################### -%define include_zope_and_plone @@INCLUDE_ZOPE_AND_PLONE@@ +%define include_zope_and_plone @@INCLUDE_ZOPE_AND_PLONE@@ @@ -32,7 +32,7 @@ Source1: @@ZOPE_ARCHIVE_TAR@@ Source3: @@ZOPE_FIVE_ARCHIVE_TAR@@ Source2: @@PLONE_ARCHIVE_TAR@@ -Patch2: Plone-2.5.2-1_CMFPlone.patch +Patch2: Plone-2.5.3-final_CMFPlone.patch %endif Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -45,9 +45,9 @@ %description -Conga is a project developing management system for remote stations. -It consists of luci, https frontend, and ricci, secure daemon that dispatches -incoming messages to underlying management modules. +Conga is a project developing management system for remote stations. +It consists of luci, https frontend, and ricci, secure daemon that dispatches +incoming messages to underlying management modules. %prep @@ -69,7 +69,7 @@ %endif %build -%configure --arch=%{_arch} \ +%configure --arch=%{_arch} \ --docdir=%{_docdir} \ --include_zope_and_plone=%{include_zope_and_plone} make %{?_smp_mflags} conga @@ -106,7 +106,7 @@ Requires: zope Requires: plone >= 2.5 %endif -Requires: grep openssl mailcap stunnel +Requires: grep openssl mailcap stunnel Requires: sed util-linux Requires(pre): grep shadow-utils @@ -115,19 +115,22 @@ %description -n luci -Conga is a project developing management system for remote stations. -It consists of luci, https frontend, and ricci, secure daemon that -dispatches incoming messages to underlying management modules. +Conga is a project developing management system for remote stations. +It consists of luci, https frontend, and ricci, secure daemon that +dispatches incoming messages to underlying management modules. This package contains Luci website. %files -n luci +%verify(not size md5 mtime) /var/lib/luci/var/Data.fs %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/luci %{_sysconfdir}/rc.d/init.d/luci %{_sbindir}/luci_admin %{_docdir}/luci-%{version}/ +%defattr(0755,root,root) + %{_libdir}/luci/ %defattr(-,luci,luci) %{_localstatedir}/lib/luci %{_libdir}/luci/ssl @@ -136,45 +139,49 @@ %endif %pre -n luci -if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then - /usr/sbin/groupadd -r -f luci >/dev/null 2>&1 +if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then + /usr/sbin/groupadd -r -f luci >&/dev/null fi -if ! /bin/grep ^luci\:x /etc/passwd 2>&1 >/dev/null; then - /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1 +if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then + /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null fi %post -n luci /sbin/chkconfig --add luci -/sbin/service luci status >/dev/null 2>&1 +/sbin/service luci status >&/dev/null LUCI_RUNNING=$? if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 + /sbin/service luci stop >&/dev/null fi -if [ -e /var/lib/luci/var/luci_backup.xml ]; then - # restore luci database - /usr/sbin/luci_admin restore >/dev/null 2>&1 +if [ -f /var/lib/luci/var/luci_backup.xml ]; then + # restore luci database + /usr/sbin/luci_admin restore >&/dev/null fi + # set initial admin password (if not already set) to random value -if ! /bin/grep True /var/lib/luci/.default_password_has_been_reset 2>&1 >/dev/null; then - /usr/sbin/luci_admin password --random >/dev/null 2>&1 +grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null +if [ $? -ne 0 ]; then + /usr/sbin/luci_admin password --random >&/dev/null && + rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old + find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci: fi if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci start >/dev/null 2>&1 + /sbin/service luci start >&/dev/null fi %preun -n luci if [ "$1" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 - /sbin/chkconfig --del luci + /sbin/service luci stop >&/dev/null + /sbin/chkconfig --del luci fi -/sbin/service luci status >/dev/null 2>&1 +/sbin/service luci status >&/dev/null LUCI_RUNNING=$? if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci stop >/dev/null 2>&1 + /sbin/service luci stop >&/dev/null fi -/usr/sbin/luci_admin backup >/dev/null 2>&1 +/usr/sbin/luci_admin backup >&/dev/null if [ "$LUCI_RUNNING" == "0" ]; then - /sbin/service luci start >/dev/null 2>&1 + /sbin/service luci start >&/dev/null fi @@ -191,7 +198,7 @@ Requires: initscripts Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1 Requires: sed util-linux -Requires: modcluster >= 0.8 +Requires: modcluster >= 0.11.0 # modreboot @@ -212,12 +219,12 @@ Requires(postun): initscripts util-linux %description -n ricci -Conga is a project developing management system for remote stations. -It consists of luci, https frontend, and ricci, secure daemon that dispatches -incoming messages to underlying management modules. +Conga is a project developing management system for remote stations. +It consists of luci, https frontend, and ricci, secure daemon that dispatches +incoming messages to underlying management modules. -This package contains listening daemon (dispatcher), as well as -reboot, rpm, storage, service and log management modules. +This package contains listening daemon (dispatcher), as well as +reboot, rpm, storage, service and log management modules. %files -n ricci @@ -249,33 +256,33 @@ %{_libexecdir}/ricci-modlog %pre -n ricci -if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then - /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1 +if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then + /usr/sbin/groupadd -r -f ricci >&/dev/null fi -if ! /bin/grep ^ricci\:x /etc/passwd 2>&1 >/dev/null; then - /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1 +if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then + /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null fi %post -n ricci -DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` -/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 -/sbin/service oddjobd reload >/dev/null 2>&1 +DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null` +/bin/kill -s SIGHUP $DBUS_PID >&/dev/null +/sbin/service oddjobd reload >&/dev/null /sbin/chkconfig --add ricci %preun -n ricci if [ "$1" == "0" ]; then - /sbin/service ricci stop > /dev/null 2>&1 - /sbin/chkconfig --del ricci + /sbin/service ricci stop >&/dev/null + /sbin/chkconfig --del ricci fi %postun -n ricci if [ "$1" == "0" ]; then - DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` - /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 - /sbin/service oddjobd reload > /dev/null 2>&1 + DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null` + /bin/kill -s SIGHUP $DBUS_PID >&/dev/null + /sbin/service oddjobd reload >&/dev/null fi if [ "$1" == "1" ]; then - /sbin/service ricci condrestart > /dev/null 2>&1 + /sbin/service ricci condrestart >&/dev/null fi @@ -288,6 +295,9 @@ %changelog +* Thu Aug 09 2007 Ryan McCabe 0.11.0-1 +- Merge in fixes from the RHEL5 code base. + * Tue Apr 30 2007 Ryan McCabe 0.9.1-9 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing) @@ -362,11 +372,11 @@ - Fixed deleting cluster - Fixed deleting node - Fixed redirection for all async->busy wait calls -- Storage module: properly probe cluster quorum if LVM locking +- Storage module: properly probe cluster quorum if LVM locking is marked as clustered * Wed Nov 01 2006 Stanko Kupcevic 0.8-23 -- 213504: luci does not correctly handle cluster.conf with +- 213504: luci does not correctly handle cluster.conf with nodes lacking FQDN * Tue Oct 31 2006 Stanko Kupcevic 0.8-22 @@ -414,19 +424,19 @@ * Fri Aug 18 2006 Stanko Kupcevic 0.8-12 - Don't auto-start ricci after installation, do it manually - Under certain circumstances, default luci password would not get reset -- Many Luci improvements +- Many Luci improvements * Wed Aug 16 2006 Stanko Kupcevic 0.8-11.7 - Move ricci-modrpm, ricci-modlog, ricci-modstorage, ricci-modservice from /usr/sbin to /usr/libexec * Wed Aug 09 2006 Stanko Kupcevic 0.8-11 -- Spin off clustermon.srpm (modcluster, cluster-snmp and +- Spin off clustermon.srpm (modcluster, cluster-snmp and cluster-cim) from conga.srpm - Luci: tighten down security * Thu Aug 03 2006 Stanko Kupcevic 0.8-10 -- Luci: fix login issues, add cluster resources, styling... +- Luci: fix login issues, add cluster resources, styling... * Wed Jul 26 2006 Stanko Kupcevic 0.8-9 - Update Luci to Plone 2.5 @@ -439,7 +449,7 @@ - More compliant specfile, minor fixes * Tue Jun 27 2006 Stanko Kupcevic 0.8-6 -- Luci persists users/clusters/systems/permissions across upgrades +- Luci persists users/clusters/systems/permissions across upgrades * Fri Jun 16 2006 Stanko Kupcevic 0.8-4 - Moved storage, service, log and rpm modules into main ricci.rpm --- conga/download_files 2007/03/27 02:07:39 1.5.2.2 +++ conga/download_files 2007/08/09 22:02:19 1.5.2.3 @@ -2,10 +2,10 @@ # URLs is a space delimited list of urls to download from -ZOPE_ARCHIVE=Zope-2.8.9-final -ZOPE_ARCHIVE_TAR=Zope-2.8.9-final.tgz -ZOPE_MD5SUM=afe67f446ed602fa7ae0137e05d095cb -ZOPE_URLs="http://www.zope.org/Products/Zope/2.8.9/Zope-2.8.9-final.tgz" +ZOPE_ARCHIVE=Zope-2.8.9.1-final +ZOPE_ARCHIVE_TAR=Zope-2.8.9.1-final.tgz +ZOPE_MD5SUM=091e96f14c9a8aadcad3f6da74cc38c1 +ZOPE_URLs="http://www.zope.org/Products/Zope/2.8.9.1/Zope-2.8.9.1-final.tgz" ZOPE_FIVE_ARCHIVE=Five @@ -14,10 +14,10 @@ ZOPE_FIVE_URLs="http://codespeak.net/z3/five/release/Five-1.2.6.tgz" -PLONE_ARCHIVE=Plone-2.5.2-1 -PLONE_ARCHIVE_TAR=Plone-2.5.2-1.tar.gz -PLONE_MD5SUM=b4891a3f11a0eacb13b234d530ba9af1 -PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.2-1.tar.gz \ - http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \ - http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz \ - http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.2-1.tar.gz" +PLONE_ARCHIVE=Plone-2.5.3-final +PLONE_ARCHIVE_TAR=Plone-2.5.3-final.tar.gz +PLONE_MD5SUM=36117b0757982d66d445b6c6b9df0e25 +PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.3-final.tar.gz \ + http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \ + http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \ + http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz" --- conga/make/version.in 2007/05/01 15:57:33 1.28.2.5 +++ conga/make/version.in 2007/08/09 22:02:21 1.28.2.6 @@ -1,5 +1,5 @@ -VERSION=0.9.1 -RELEASE=8 +VERSION=0.11.0 +RELEASE=1 # Remove "_UNRELEASED" at release time. # Put release num at the beggining, # so that after it gets released, it has