[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-11 06:48:11

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 
	luci/cluster   : fence-macros 
	luci/site/luci/Extensions: StorageReport.py 

Log message:
	Fix bz441574 (nodename" field for fence_scsi disabled when adding a new fence device/instance)
	
	Sync up spec files' %pre and %post sections with RHEL5.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.11&r2=1.25.2.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.22&r2=1.67.2.23
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.4.1&r2=1.2.4.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.4&r2=1.22.2.5

--- conga/clustermon.spec.in.in	2008/04/07 20:11:44	1.25.2.11
+++ conga/clustermon.spec.in.in	2008/04/11 06:48:09	1.25.2.12
@@ -1,20 +1,18 @@
-###############################################################################
-###############################################################################
-##
-##  Copyright (C) 2006-2007 Red Hat, Inc.  All rights reserved.
-##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
-##
-###############################################################################
+##############################################################################
+#
+# Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License version 2.
+#
 ###############################################################################
 
 
 %define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
 
 
-############  SRPM  ###################
+############ SRPM ###################
 
 
 Name: clustermon
@@ -60,7 +58,7 @@
 
 
 
-###  cluster module  ###
+### cluster module ###
 
 
 %package -n modcluster
@@ -91,31 +89,32 @@
 
 %post -n modcluster
 /sbin/chkconfig --add modclusterd
-DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
-/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
+DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
 # It's ok if this fails (it will fail when oddjob is not running).
-/sbin/service oddjobd reload > /dev/null 2>&1 || true
+/sbin/service oddjobd reload >&/dev/null
+exit 0
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
-	/sbin/service modclusterd stop > /dev/null 2>&1
+	/sbin/service modclusterd stop >&/dev/null
 	/sbin/chkconfig --del modclusterd
 fi
+exit 0
 
 %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
+	/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+	/sbin/service oddjobd reload >&/dev/null
 fi
 if [ "$1" == "1" ]; then
-	/sbin/service modclusterd condrestart > /dev/null 2>&1
+	/sbin/service modclusterd condrestart >&/dev/null
 fi
+exit 0
 
 
-
-
-###  cluster-snmp  ###
+### cluster-snmp ###
 
 
 %package -n cluster-snmp
@@ -140,20 +139,19 @@
 			%{_docdir}/cluster-snmp-%{version}/
 
 %post -n cluster-snmp
-/sbin/service snmpd condrestart > /dev/null 2>&1 || true
+/sbin/service snmpd condrestart >&/dev/null
+exit 0
 
 %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
 fi
+exit 0
 
 
 
-
-
-###  cluster-cim  ###
-
+### cluster-cim ###
 
 %package -n cluster-cim
 Group: System Environment/Base
@@ -176,12 +174,13 @@
 
 %post -n cluster-cim
 # pegasus might not be running, don't fail %post
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1 || true
+/sbin/service tog-pegasus condrestart >&/dev/null
+exit 0
 
 %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
 fi
 # pegasus might not be running, don't fail %postun
 exit 0
--- conga/conga.spec.in.in	2008/04/07 20:11:44	1.67.2.22
+++ conga/conga.spec.in.in	2008/04/11 06:48:10	1.67.2.23
@@ -1,22 +1,18 @@
 ###############################################################################
-###############################################################################
-##
-##  Copyright (C) 2006-2007 Red Hat, Inc.  All rights reserved.
-##
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
-##
-###############################################################################
+#
+# Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License version 2.
+#
 ###############################################################################
 
 
 %define include_zope_and_plone	@@INCLUDE_ZOPE_AND_PLONE@@
 
 
-
-############  SRPM  ###################
-
+############ SRPM ###################
 
 Name: conga
 Version: @@VERS@@
@@ -42,13 +38,11 @@
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 
-
 %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.
 
-
 %prep
 %setup -q
 %if "%{include_zope_and_plone}" == "yes"
@@ -81,13 +75,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-
-
-
-
-
-#######  luci  #######
-
+####### luci #######
 
 %package -n luci
 
@@ -112,14 +100,12 @@
 Requires(post): chkconfig initscripts
 Requires(preun): chkconfig initscripts
 
-
 %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.
 
-This package contains Luci website.
-
+This package contains the luci server.
 
 %files -n luci
 %verify(not size md5 mtime) /var/lib/luci/var/Data.fs
@@ -138,12 +124,12 @@
 %endif
 
 %pre -n luci
-grep ^luci\:x /etc/group >&/dev/null
-if [ $? -ne 0 ]; then 
+groupmod luci >&/dev/null
+if [ $? -eq 6 ]; then 
 	/usr/sbin/groupadd -r -f luci >&/dev/null
 fi
 
-grep ^luci\:x /etc/passwd >&/dev/null
+id luci >&/dev/null
 if [ $? -ne 0 ]; then
 	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
 fi
@@ -159,7 +145,7 @@
 	fi
 	/usr/sbin/luci_admin backup >&/dev/null
 	if [ $LUCI_RUNNING -eq 0 ]; then
-		/sbin/service luci start >& /dev/null
+		/sbin/service luci start >&/dev/null
 	fi
 fi
 exit 0
@@ -206,10 +192,8 @@
 exit 0
 
 
-
 ### ricci daemon & basic modules ###
 
-
 %package -n ricci
 
 Group: System Environment/Base
@@ -232,7 +216,6 @@
 
 # modlog
 
-
 Requires(pre): grep shadow-utils
 Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
@@ -246,7 +229,6 @@
 This package contains listening daemon (dispatcher), as well as
 reboot, rpm, storage, service and log management modules.
 
-
 %files -n ricci
 %defattr(-,root,root)
 # ricci
@@ -318,7 +300,8 @@
 
 
 %changelog
-* Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-1
+* Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-2
+- Fix bz441574 (nodename" field for fence_scsi disabled when adding a new fence device/instance)
 - Fix bz349561 (Add Conga support for Oracle Resource Agent)
 - Fix bz369131 (RFE: should only have to enter a system's password once)
 - Fix bz333181 (Add option to not fail-back service)
--- conga/luci/cluster/fence-macros	2008/03/25 01:27:10	1.2.4.1
+++ conga/luci/cluster/fence-macros	2008/04/11 06:48:10	1.2.4.2
@@ -1849,7 +1849,7 @@
 			<tr>
 				<td>Node name</td>
 				<td>
-					<input type="text" name="node" disabled="disabled"
+					<input type="text" name="node"
 						tal:attributes="value request/node | nothing" />
 				</td>
 			</tr>
--- conga/luci/site/luci/Extensions/StorageReport.py	2008/03/25 01:27:12	1.22.2.4
+++ conga/luci/site/luci/Extensions/StorageReport.py	2008/04/11 06:48:11	1.22.2.5
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2006-2008 Red Hat, Inc.
 #
 # This program is free software; you can redistribute
 # it and/or modify it under the terms of version 2 of the