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

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-22 18:00:31

Modified files:
	.              : conga.spec.in.in 

Log message:
	both parts of the certs work are done now; update the changelog entry to reflect this.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.63&r2=1.64

--- conga/conga.spec.in.in	2006/12/14 18:28:14	1.63
+++ conga/conga.spec.in.in	2006/12/22 18:00:31	1.64
@@ -291,7 +291,7 @@
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 - luci storage: fix bytes->TB conversion
-- Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (step 1 - backend)
+- Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
 - Fixed bz217387 (luci - HTML error shows up in display (minor))
 - Fixed bz215031 (Cannot add a resource to a service via luci web app)
 - Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-09-23 17:34:56

Modified files:
	.              : conga.spec.in.in 

Log message:
	Relocate misplaced spec block

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.104&r2=1.45.2.105

--- conga/conga.spec.in.in	2008/09/23 16:05:07	1.45.2.104
+++ conga/conga.spec.in.in	2008/09/23 17:34:56	1.45.2.105
@@ -49,6 +49,9 @@
 It consists of luci, https frontend, and ricci, secure daemon that dispatches
 incoming messages to underlying management modules.
 
+%prep
+%setup -q
+
 %{__cat} <<EOF >%{my_requires}
 #!/bin/sh
 %{__find_requires} | grep -v '^libvirt'
@@ -57,8 +60,6 @@
 chmod +x %{my_requires}
 %define __find_requires %{my_requires}
 
-%prep
-%setup -q
 %if "%{include_zope_and_plone}" == "yes"
 # Zope
 %setup -q -T -D -a 1
@@ -322,6 +323,9 @@
 
 ###  changelog ###
 %changelog
+* Tue Sep 23 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-5
+ - Fix bz463220
+
 * Wed Aug 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-4
 - Fix bz459562 (charset configuration fix for luci)
 - Fix bz459469 (An unknown device type was given: "gnbd.")

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-06-13 18:39:15

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix missing dep

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.32&r2=1.67.2.33

--- conga/conga.spec.in.in	2008/06/10 15:16:35	1.67.2.32
+++ conga/conga.spec.in.in	2008/06/13 18:39:14	1.67.2.33
@@ -82,7 +82,7 @@
 Group: System Environment/Base
 Summary: Remote Management System - Management Station
 
-Requires: chkconfig initscripts
+Requires: chkconfig initscripts bc
 Requires: python >= 2.3.4
 %if "%{include_zope_and_plone}" == "yes"
 Provides: config(luci) = %{version}-%{release}

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-06-13 18:38:50

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix missing dep

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.98&r2=1.99

--- conga/conga.spec.in.in	2008/05/16 17:11:17	1.98
+++ conga/conga.spec.in.in	2008/06/13 18:38:49	1.99
@@ -77,7 +77,7 @@
 Group: System Environment/Base
 Summary: Remote Management System - Management Station
 
-Requires: chkconfig initscripts
+Requires: chkconfig initscripts bc
 Requires: python >= 2.4.1
 %if "%{include_zope_and_plone}" == "yes"
 Provides: config(luci) = %{version}-%{release}

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-05-16 17:11:18

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix so 'rpm -V luci' doesn't fail

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.97&r2=1.98

--- conga/conga.spec.in.in	2008/03/19 17:59:15	1.97
+++ conga/conga.spec.in.in	2008/05/16 17:11:17	1.98
@@ -105,6 +105,7 @@
 
 %files -n luci
 %verify(not size md5 mtime) /var/lib/luci/var/Data.fs
+%verify(not size md5 mtime) /var/lib/luci/.default_password_has_been_reset
 %defattr(-,root,root)
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-05-16 17:10:08

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix so 'rpm -V luci' doesn't fail

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.29&r2=1.67.2.30

--- conga/conga.spec.in.in	2008/05/12 17:09:53	1.67.2.29
+++ conga/conga.spec.in.in	2008/05/16 17:10:08	1.67.2.30
@@ -109,6 +109,7 @@
 
 %files -n luci
 %verify(not size md5 mtime) /var/lib/luci/var/Data.fs
+%verify(not size md5 mtime) /var/lib/luci/.default_password_has_been_reset
 %defattr(-,root,root)
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-05-16 17:08:29

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix bz446907

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.87&r2=1.45.2.88

--- conga/conga.spec.in.in	2008/05/12 17:37:38	1.45.2.87
+++ conga/conga.spec.in.in	2008/05/16 17:08:28	1.45.2.88
@@ -104,6 +104,7 @@
 
 %files -n luci
 %verify(not size md5 mtime) /var/lib/luci/var/Data.fs
+%verify(not size md5 mtime) /var/lib/luci/.default_password_has_been_reset
 %defattr(-,root,root)
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
 				%{_sysconfdir}/rc.d/init.d/luci
@@ -295,6 +296,7 @@
 - Fix bz444938 (conga fails to create proper cluster.conf entries for gfs2 filesystem type)
 - Fix bz444210 (Adding multiple fence devices at the same time causes duplicate entries)
 - Fix bz444381 (conga writes 'exportpath' instead of 'export' attribute for netfs)
+- Fix bz446907 (rpm -V luci fails)
 
 * Fri Apr 18 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-8
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-04-18 03:28:44

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update the changelog now that we've got a bz ticket.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.79&r2=1.45.2.80

--- conga/conga.spec.in.in	2008/04/16 20:46:08	1.45.2.79
+++ conga/conga.spec.in.in	2008/04/18 03:28:44	1.45.2.80
@@ -294,7 +294,7 @@
 * Thu Apr 10 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-8
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
 - Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new fence device/instance)
-- Use the 'ipaddr' attribute, not 'hostname' for RSA and RSB fencing.
+- Fix bz442997 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)
 
 * Wed Feb 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-03-19 14:59:42

Modified files:
	.              : conga.spec.in.in 

Log message:
	Add a build dependency against libvirt-devel for building ricci

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.72&r2=1.45.2.73

--- conga/conga.spec.in.in	2008/03/19 14:45:33	1.45.2.72
+++ conga/conga.spec.in.in	2008/03/19 14:59:41	1.45.2.73
@@ -32,8 +32,8 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.4.1
-BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: cman-devel
+BuildRequires: glibc-devel gcc-c++ libxml2-devel sed libvirt
+BuildRequires: cman-devel libvirt-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-01-23 05:20:44

Modified files:
	.              : conga.spec.in.in 

Log message:
	Plone now requires this

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.63&r2=1.45.2.64

--- conga/conga.spec.in.in	2008/01/23 04:57:18	1.45.2.63
+++ conga/conga.spec.in.in	2008/01/23 05:20:44	1.45.2.64
@@ -90,6 +90,7 @@
 %endif
 Requires: grep openssl mailcap stunnel
 Requires: sed util-linux
+Requires: python-imaging
 
 Requires(pre): grep shadow-utils
 Requires(post): chkconfig initscripts

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-01-23 04:57:18

Modified files:
	.              : conga.spec.in.in 

Log message:
	It's 2008.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.62&r2=1.45.2.63

--- conga/conga.spec.in.in	2008/01/23 04:56:16	1.45.2.62
+++ conga/conga.spec.in.in	2008/01/23 04:57:18	1.45.2.63
@@ -291,7 +291,7 @@
 
 ###  changelog ###
 %changelog
-* Tue Jan 22 2007 Ryan McCabe <rmccabe@redhat.com> 0.12.0-0
+* Tue Jan 22 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-0
 - Fixed bz230462 (RFE: Only reboot installation target machines when needed)
 - Fixed bz238655 (conga does not set the "nodename" attribute for manual fencing)
 - Fixed bz239387 (RFE: add timeouts for actions that can leave cluster unreachable)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-01-22 15:20:28

Modified files:
	.              : conga.spec.in.in 

Log message:
	sync changelog with bugzilla

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.94&r2=1.95

--- conga/conga.spec.in.in	2008/01/17 18:45:10	1.94
+++ conga/conga.spec.in.in	2008/01/22 15:20:27	1.95
@@ -289,20 +289,30 @@
 
 %changelog
 * Wed Sep 19 2007 Ryan McCabe <rmccabe@redhat.com> 0.12.0-1
-- Fixed bz253720: "trust" box shouldn't be an option if it is required
+- Fixed bz230462 (RFE: Only reboot installation target machines when needed)
+- Fixed bz238655 (conga does not set the "nodename" attribute for manual fencing)
+- Fixed bz239387 (RFE: add timeouts for actions that can leave cluster unreachable)
+- Fixed bz249097 (allow a space as a valid password char)
+- Fixed bz249619 (luci "Manage Systems and Clusters" display of clusters and storage systems is cascaded)
+- Fixed bz252348 (RFE: should only have to enter a system's password once)
+- Fixed bz253223 (When deleting a node from conga, the fence device isn't deleted)
+- Fixed bz253720 ("trust" box shouldn't be an option if it is required)
+- Fixed bz253727 (RFE: graphical view should be default in partiton tables view)
 - Fixed bz253842 (luci ignores File System Resource Configuration)
+- Fixed bz253879 (RFE: drop the link/details column in the resource section table)
+- Fixed bz264161 (RFE: support setting the "__independent_subtree" attribute on cluster resources)
 - Fixed bz277661 (RFE: Better instructions on the luci login page if luci_admin not run.)
 - Fixed bz277711 (RFE: luci_admin should check that luci is running before asking for the password)
 - Fixed bz295771 (RFE: add ability to set self_fence attribute for clusterfs resources)
-- Fixed bz253223 (When deleting a node from conga, the fence device isn't deleted)
-- Fixed bz253879 (RFE: drop the link/details column in the resource section table)
-- Fixed bz249619 (luci "Manage Systems and Clusters" display of clusters and storage systems is cascaded)
+- Fixed bz301411 (conga shouldn't turn on init scripts if the user turned them off)
+- Fixed bz303661 (Browser support to encompass Internet Explorer on Windows Vista and XP)
+- Fixed bz304891 (Browser support to encompass Firefox on Windows Vista and XP.)
 - Fixed bz315631 (conga doesn't handle the cluster restart operation properly)
+- Fixed bz317261 (Check for dual power fencing fails when adding new fence instances)
 - Fixed bz320411 (conga should use the node name in cluster.conf and not FQDN for fencing)
-- Fixed bz253727 (RFE: graphical view should be default in partiton tables view)
 - Fixed bz337041 (Add option to not fail-back service)
-- Fixed bz264161 (RFE: support setting the "__independent_subtree" attribute on cluster resources)
-- Fixed bz239387 (RFE: add timeouts for actions that can leave cluster unreachable)
+- Fixed bz340111 (Storage redirection after probe does not work on WinXP with FF2)
+- Fixed bz379461 (Conga doesn't have the option for modulename for drac fencing)
 - Fixed bz383071 (Virtual machine configuration - add field for "migration type" xml attr = "migrate")
 
 * Mon Aug 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-10-09 20:57:35

Modified files:
	.              : conga.spec.in.in 

Log message:
	Changelog update for 249619 fix

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.85&r2=1.86

--- conga/conga.spec.in.in	2007/10/09 20:24:41	1.85
+++ conga/conga.spec.in.in	2007/10/09 20:57:35	1.86
@@ -295,6 +295,7 @@
 - Fixed bz295771 (RFE: add ability to set self_fence attribute for clusterfs resources)
 - Fixed bz253223 (When deleting a node from conga, the fence device isn't deleted)
 - Fixed bz253879 (RFE: drop the link/details column in the resource section table)
+- Fixed bz249619 (luci "Manage Systems and Clusters" display of clusters and storage systems is cascaded)
 
 * Mon Aug 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
 - Fixed bz253783

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-29 01:02:02

Modified files:
	.              : conga.spec.in.in 

Log message:
	update the changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.15&r2=1.67.2.16

--- conga/conga.spec.in.in	2007/08/23 18:47:32	1.67.2.15
+++ conga/conga.spec.in.in	2007/08/29 01:02:00	1.67.2.16
@@ -319,18 +319,20 @@
 
 
 %changelog
-* Thu Aug 09 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-1
+* Tue Aug 28 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-1
 - Merge in fixes from the RHEL5 code base.
 - Fix bz238727 (Conga provides no way to remove a dead node from a cluster)
 - Fix bz241414 (Installation using Conga shows "error" in message during reboot cycle.)
 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)
 - Fix bz245200 (Conga needs to support Internet Explorer 6.0 and later)
 - Fix bz227723 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before)
-- Fix bz253904 (Quorum disk page: Interval + tko should be together)
 - Fix bz253905 (Quorum disk page: Minimum score does not need to be required)
+- Fix bz253906 (Quorum disk page: Error when trying to continue w/o a heuristic)
+- Fix bz253784
+- Fix bz253901 (No node IDs generated on new RHEL4 / DLM cluster)
 - Related: bz241417
 - Resolves: bz238727, bz241414, bz238656, bz245200, bz227723
-- Resolves: bz253904, bz253905
+- Resolves: bz253905, bz253906, bz253784, bz253901
 
 * Tue Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-9
 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-27 18:42:17

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update the date in the latest changelog entry

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.59&r2=1.45.2.60

--- conga/conga.spec.in.in	2007/08/27 18:36:43	1.45.2.59
+++ conga/conga.spec.in.in	2007/08/27 18:42:17	1.45.2.60
@@ -310,7 +310,7 @@
 
 ###  changelog ###
 %changelog
-* Wed Aug 22 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
+* Mon Aug 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
 - Fixed bz253783
 - Fixed bz253914 (conga doesn't allow you to reuse nfs export and nfs client resources)
 - Fixed bz254038 (Impossible to set many valid quorum disk configurations via conga)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-08-11 04:23:31

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fixes from the RHEL5 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.80&r2=1.81

--- conga/conga.spec.in.in	2007/07/16 22:21:31	1.80
+++ conga/conga.spec.in.in	2007/08/11 04:23:31	1.81
@@ -134,18 +134,37 @@
 %endif
 
 %pre -n luci
-if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
+grep ^luci\:x /etc/group >&/dev/null
+if [ $? -ne 0 ]; then 
 	/usr/sbin/groupadd -r -f luci >&/dev/null
 fi
-if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
+
+grep ^luci\:x /etc/passwd >&/dev/null
+if [ $? -ne 0 ]; then
 	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
 fi
 
+if [ $1 -gt 1 ]; then
+	# Package upgrade
+	/sbin/service luci status >&/dev/null
+	LUCI_RUNNING=$?
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci stop >& /dev/null
+		# allow the zope machinery time to shut down
+		sleep 4
+	fi
+	/usr/sbin/luci_admin backup >&/dev/null
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci start >& /dev/null
+	fi
+fi
+exit 0
+
 %post -n luci
 /sbin/chkconfig --add luci
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" == "0" ]; then
+if [ $LUCI_RUNNING -eq 0 ]; then
 	/sbin/service luci stop >&/dev/null
 fi
 if [ -f /var/lib/luci/var/luci_backup.xml ]; then
@@ -157,28 +176,30 @@
 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:
+		rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old >& /dev/null
+	find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci: >&/dev/null
 fi
-if [ "$LUCI_RUNNING" == "0" ]; then
+if [ $LUCI_RUNNING -eq 0 ]; then
 	/sbin/service luci start >&/dev/null
 fi
+exit 0
 
 %preun -n luci
-if [ "$1" == "0" ]; then
+if [ $1 -eq 0 ]; then
+	# uninstall
 	/sbin/service luci stop >&/dev/null
 	/sbin/chkconfig --del luci
-fi
-/sbin/service luci status >&/dev/null
-LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" == "0" ]; then
-	/sbin/service luci stop >&/dev/null
-fi
-/usr/sbin/luci_admin backup >&/dev/null
-if [ "$LUCI_RUNNING" == "0" ]; then
-	/sbin/service luci start >&/dev/null
-fi
 
+	/sbin/service luci status >&/dev/null
+	LUCI_RUNNING=$?
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci stop >&/dev/null
+		# allow the zope machinery time to shut down
+		sleep 4
+	fi
+	/usr/sbin/luci_admin backup >&/dev/null
+fi
+exit 0
 
 
 
@@ -193,7 +214,7 @@
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
 Requires: sed util-linux
-Requires: modcluster >= 0.8
+Requires: modcluster >= 0.10.0
 
 # modreboot
 
@@ -257,18 +278,21 @@
 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
+exit 0
 
 %post -n ricci
 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
+exit 0
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
 	/sbin/service ricci stop >&/dev/null
 	/sbin/chkconfig --del ricci
 fi
+exit 0
 
 %postun -n ricci
 if [ "$1" == "0" ]; then
@@ -279,7 +303,7 @@
 if [ "$1" == "1" ]; then
 	/sbin/service ricci condrestart >&/dev/null
 fi
-
+exit 0
 
 
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-11 04:22:03

Modified files:
	.              : conga.spec.in.in 

Log message:
	Fix a longstanding bug that caused the luci database to not be restored properly upon upgrade unless a backup had been made previous to the upgrade.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.13&r2=1.67.2.14

--- conga/conga.spec.in.in	2007/08/09 22:34:58	1.67.2.13
+++ conga/conga.spec.in.in	2007/08/11 04:22:03	1.67.2.14
@@ -139,18 +139,37 @@
 %endif
 
 %pre -n luci
-if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
+grep ^luci\:x /etc/group >&/dev/null
+if [ $? -ne 0 ]; then 
 	/usr/sbin/groupadd -r -f luci >&/dev/null
 fi
-if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
+
+grep ^luci\:x /etc/passwd >&/dev/null
+if [ $? -ne 0 ]; then
 	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
 fi
 
+if [ $1 -gt 1 ]; then
+	# Package upgrade
+	/sbin/service luci status >&/dev/null
+	LUCI_RUNNING=$?
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci stop >& /dev/null
+		# allow the zope machinery time to shut down
+		sleep 4
+	fi
+	/usr/sbin/luci_admin backup >&/dev/null
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci start >& /dev/null
+	fi
+fi
+exit 0
+
 %post -n luci
 /sbin/chkconfig --add luci
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" == "0" ]; then
+if [ $LUCI_RUNNING -eq 0 ]; then
 	/sbin/service luci stop >&/dev/null
 fi
 if [ -f /var/lib/luci/var/luci_backup.xml ]; then
@@ -162,28 +181,30 @@
 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:
+		rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old >& /dev/null
+	find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci: >&/dev/null
 fi
-if [ "$LUCI_RUNNING" == "0" ]; then
+if [ $LUCI_RUNNING -eq 0 ]; then
 	/sbin/service luci start >&/dev/null
 fi
+exit 0
 
 %preun -n luci
-if [ "$1" == "0" ]; then
+if [ $1 -eq 0 ]; then
+	# uninstall
 	/sbin/service luci stop >&/dev/null
 	/sbin/chkconfig --del luci
-fi
-/sbin/service luci status >&/dev/null
-LUCI_RUNNING=$?
-if [ "$LUCI_RUNNING" == "0" ]; then
-	/sbin/service luci stop >&/dev/null
-fi
-/usr/sbin/luci_admin backup >&/dev/null
-if [ "$LUCI_RUNNING" == "0" ]; then
-	/sbin/service luci start >&/dev/null
-fi
 
+	/sbin/service luci status >&/dev/null
+	LUCI_RUNNING=$?
+	if [ $LUCI_RUNNING -eq 0 ]; then
+		/sbin/service luci stop >&/dev/null
+		# allow the zope machinery time to shut down
+		sleep 4
+	fi
+	/usr/sbin/luci_admin backup >&/dev/null
+fi
+exit 0
 
 
 
@@ -262,18 +283,21 @@
 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
+exit 0
 
 %post -n ricci
 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
+exit 0
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
 	/sbin/service ricci stop >&/dev/null
 	/sbin/chkconfig --del ricci
 fi
+exit 0
 
 %postun -n ricci
 if [ "$1" == "0" ]; then
@@ -284,7 +308,7 @@
 if [ "$1" == "1" ]; then
 	/sbin/service ricci condrestart >&/dev/null
 fi
-
+exit 0
 
 
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-09 22:37:31

Modified files:
	.              : conga.spec.in.in 

Log message:
	modclusterd >= 0.10.0 is needed for fence_xvm key management

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.50&r2=1.45.2.51

--- conga/conga.spec.in.in	2007/08/08 21:24:12	1.45.2.50
+++ conga/conga.spec.in.in	2007/08/09 22:37:31	1.45.2.51
@@ -193,7 +193,7 @@
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
 Requires: sed util-linux
-Requires: modcluster >= 0.8
+Requires: modcluster >= 0.10.0
 
 # modreboot
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-16 22:18:50

Modified files:
	.              : conga.spec.in.in 

Log message:
	Make rpm -V ignore changes to Data.fs, which is modified by postinstall scripts.
	Related to bz240034

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.46&r2=1.45.2.47

--- conga/conga.spec.in.in	2007/07/16 21:06:14	1.45.2.46
+++ conga/conga.spec.in.in	2007/07/16 22:18:50	1.45.2.47
@@ -118,6 +118,7 @@
 
 
 %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

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-29 15:58:22

Modified files:
	.              : conga.spec.in.in 

Log message:
	Add fixed bugs that were accidentally omitted from the changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.43&r2=1.45.2.44

--- conga/conga.spec.in.in	2007/06/27 07:43:17	1.45.2.43
+++ conga/conga.spec.in.in	2007/06/29 15:58:22	1.45.2.44
@@ -306,13 +306,18 @@
 - Fixed bz239388 (conga storage: default VG creation should be clustered if a cluster node)
 - Fixed bz239327 (Online User Manual needs modification)
 - Fixed bz227852 (Lack of debugging information in logs - support issue)
+- Fixed bz245025 (Conga does not accept '&' character in password field for Fence configuration)
+- Fixed bz225588 (luci web app does not enforce selection of fence port)
+- Fixed bz212022 (cannot create cluster using ip addresses)
+- Fixed bz223162 (Error trying to create a new fence device for a cluster node)
+
 - Upgraded to the latest Plone (2.5.3)
 - Added a "reprobe storage" button that invalidates cached storage reports
   and forces a new probe.
 - Resolves: bz238655, bz221899, bz225782, bz227682, bz227743, bz239389,
 - Resolves: bz239596, bz240034, bz240361, bz241415, bz241418, bz241706,
 - Resolves: bz241727, bz242668, bz243701, bz244146, bz244878, bz238726,
-- Resolves: bz239388, bz239327, bz227852
+- Resolves: bz239388, bz239327, bz227852, bz245025, bz225588, bz212022
 
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
 - Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-26 21:41:48

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update the changelog.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.41&r2=1.45.2.42

--- conga/conga.spec.in.in	2007/06/25 19:10:53	1.45.2.41
+++ conga/conga.spec.in.in	2007/06/26 21:41:48	1.45.2.42
@@ -307,10 +307,15 @@
 - Fixed bz244146 (Add port number to message when ricci is not started/firewalled on cluster nodes.)
 - Fixed bz244878 (Successful login results in an infinite redirection loop with MSIE)
 - Fixed bz239388 (conga storage: default VG creation should be clustered if a cluster node)
+- Fixed bz239327 (Online User Manual needs modification)
+- Fixed bz227852 (Lack of debugging information in logs - support issue)
+- Upgraded to the latest Plone (2.5.3)
+- Added a "reprobe storage" button that invalidates cached storage reports
+  and forces a new probe.
 - Resolves: bz238655, bz221899, bz225782, bz227682, bz227743, bz239389,
 - Resolves: bz239596, bz240034, bz240361, bz241415, bz241418, bz241706,
 - Resolves: bz241727, bz242668, bz243701, bz244146, bz244878, bz238726,
-- Resolves: bz239388
+- Resolves: bz239388, bz239327, bz227852
 
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
 - Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-06-18 19:06:37

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update changelog to reflect bugs fixed

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.37&r2=1.45.2.38

--- conga/conga.spec.in.in	2007/06/18 18:39:31	1.45.2.37
+++ conga/conga.spec.in.in	2007/06/18 19:06:37	1.45.2.38
@@ -284,11 +284,29 @@
 
 
 %changelog
-* Mon Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-7
+* Mon Jun 18 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-1
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 - Fixed bz238655 (conga does not set the "nodename" attribute for manual fencing)
+- Fixed bz221899 (Node log displayed in partially random order)
+- Fixed bz225782 (Need more luci service information on startup - no info written to log about failed start cause)
+- Fixed bz227743 (Intermittent/recurring problem - when cluster is deleted, sometimes a node is not affected)
+- Fixed bz227682 (saslauthd[2274]: Deprecated pam_stack module called from service "ricci")
+- Fixed bz239389 (conga cluster: make 'enable shared storage' the default)
+- Fixed bz239596
+- Fixed bz240034 (rpm verify fails on luci)
+- Fixed bz240361 (Conga storage UI front-end is too slow rendering storage)
+- Fixed bz241415 (Installation using Conga shows "error" in message during reboot cycle.)
+- Fixed bz241418 (Conga tries to configurage cluster snaps, though they are not available.)
+- Fixed bz241706 (Eliminate confusion in add fence flow)
+- Fixed bz241727 (can't set user permissions in luci)
+- Fixed bz242668 (luci init script can return non-LSB-compliant return codes)
+- Fixed bz243701 (ricci init script can exit with non-LSB-compliant return codes)
+- Fixed bz244146 (Add port number to message when ricci is not started/firewalled on cluster nodes.)
+- Resolves: bz238655, bz221899, bz225782, bz227682, bz227743, bz239389,
+- Resolves: bz239596, bz240034, bz240361, bz241415, bz241418, bz241706,
+- Resolves: bz241727, bz242668, bz243701, bz244146
 
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
 - Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-04-30 19:34:42

Modified files:
	.              : conga.spec.in.in 

Log message:
	Make checks using grep against /etc/{passwd,group} more strict.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.8&r2=1.67.2.9

--- conga/conga.spec.in.in	2007/04/25 18:08:42	1.67.2.8
+++ conga/conga.spec.in.in	2007/04/30 18:34:42	1.67.2.9
@@ -136,10 +136,10 @@
 %endif
 
 %pre -n luci
-if ! /bin/grep luci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
 fi
-if ! /bin/grep luci\:x /etc/passwd 2>&1 >/dev/null; then
+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
 fi
 
@@ -249,10 +249,10 @@
 			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
-if ! /bin/grep ricci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
 fi
-if ! /bin/grep ricci\:x /etc/passwd 2>&1 >/dev/null; then
+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
 fi
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-04-10 20:51:26

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.30&r2=1.45.2.31

--- conga/conga.spec.in.in	2007/03/30 15:12:52	1.45.2.30
+++ conga/conga.spec.in.in	2007/04/10 19:51:25	1.45.2.31
@@ -294,8 +294,12 @@
 - Fixed bz230457 (kmod-gfs-xen not installed with Conga install)
 - Fixed bz230461 ('enable shared storage' option cleared whenever there is a configuration error)
 - Fixed bz230469 (Must manually edit cluster.conf on the dom0 cluster to add "<fence_xvmd/>")
-- Resolves: bz229027, bz230447, bz230452, bz230454, bz230457, bz230461
-- Resolves: bz230469, bz228637, bz233326, bz225747
+- Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)
+- Fixed bz225164 (Conga allows creation/rename of clusters with name greater than 15 characters)
+- Fixed bz227758 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before assignment)
+- Resolves: bz229027, bz230447, bz230452, bz230454, bz230457,
+- Resolves: bz230469, bz228637, bz233326, bz225747, bz225206,
+- Resolves: bz230461, bz225164, bz227758
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Fixed bz212445 (release blocker: prevent management page access)

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2007-03-30 15:48:08

Modified files:
	.              : conga.spec.in.in 

Log message:
	Include python-devel as build dependancy

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.28&r2=1.45.2.29

--- conga/conga.spec.in.in	2007/03/27 02:20:03	1.45.2.28
+++ conga/conga.spec.in.in	2007/03/30 14:48:08	1.45.2.29
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
+##  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
@@ -36,9 +36,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-%if "%{include_zope_and_plone}" == "yes"
 BuildRequires: python-devel >= 2.4.1
-%endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 #BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
@@ -93,13 +91,13 @@
 Summary: Remote Management System - Management Station
 
 Requires: chkconfig initscripts
-%if "%{include_zope_and_plone}" == "yes"
 Requires: python >= 2.4.1
+%if "%{include_zope_and_plone}" == "yes"
 Provides: config(luci) = %{version}-%{release}
+# don't provide zope internals
 AutoProv: no
 %else
 AutoProv: yes
-Requires: python
 Requires: zope
 Requires: plone >= 2.5
 %endif

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-27 03:20:03

Modified files:
	.              : conga.spec.in.in 

Log message:
	- Update changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.27&r2=1.45.2.28

--- conga/conga.spec.in.in	2007/03/27 02:11:03	1.45.2.27
+++ conga/conga.spec.in.in	2007/03/27 02:20:03	1.45.2.28
@@ -285,7 +285,8 @@
 %changelog
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-31
-- Upgrade to Zope 2.9.7-final
+- Fixed bz233326 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
+- Fixed bz228637 (CVE-2007-1462 security alert - passwords sent back from server as input value)
 - Fixed bz229027 (luci failover domain forms are missing/empty)
 - Fixed bz230447 (fence_xvm is incorrectly listed as "xmv" in virtual cluster)
 - Fixed bz230452 (Advanced options parameters settings don't do anything)
@@ -293,7 +294,7 @@
 - Fixed bz230457 (kmod-gfs-xen not installed with Conga install)
 - Fixed bz230461 ('enable shared storage' option cleared whenever there is a configuration error)
 - Fixed bz230469 (Must manually edit cluster.conf on the dom0 cluster to add "<fence_xvmd/>")
-- Resolves: bz229027, bz230447, bz230452, bz230454, bz230457, bz230461, bz230469
+- Resolves: bz229027, bz230447, bz230452, bz230454, bz230457, bz230461, bz230469, bz228637, bz233326
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Fixed bz212445 (release blocker: prevent management page access)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-03-27 03:17:16

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.75&r2=1.76

--- conga/conga.spec.in.in	2007/03/21 16:55:15	1.75
+++ conga/conga.spec.in.in	2007/03/27 02:17:16	1.76
@@ -288,7 +288,7 @@
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
- - 
+- Fized bz233326 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
 
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.3-2

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-20 17:39:13

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.25&r2=1.45.2.26

--- conga/conga.spec.in.in	2007/03/01 01:02:43	1.45.2.25
+++ conga/conga.spec.in.in	2007/03/20 17:39:13	1.45.2.26
@@ -284,6 +284,16 @@
 
 %changelog
 
+* Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-31
+- Fixed bz229027 (luci failover domain forms are missing/empty)
+- Fixed bz230447 (fence_xvm is incorrectly listed as "xmv" in virtual cluster)
+- Fixed bz230452 (Advanced options parameters settings don't do anything)
+- Fixed bz230454 (Unable to configure a virtual service)
+- Fixed bz230457 (kmod-gfs-xen not installed with Conga install)
+- Fixed bz230461 ('enable shared storage' option cleared whenever there is a configuration error)
+- Fixed bz230469 (Must manually edit cluster.conf on the dom0 cluster to add "<fence_xvmd/>")
+- Resolves: bz229027, bz230447, bz230452, bz230454, bz230457, bz230461, bz230469
+
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Fixed bz212445 (release blocker: prevent management page access)
 - Resolves: bz212445

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-03-20 17:38:16

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.4&r2=1.67.2.5

--- conga/conga.spec.in.in	2007/02/16 15:55:44	1.67.2.4
+++ conga/conga.spec.in.in	2007/03/20 17:38:15	1.67.2.5
@@ -287,6 +287,9 @@
 
 
 %changelog
+* Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6
+- Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
+- Related: bz205522
 
 * Fri Feb 16 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-5
 - Fixed bz228637 (security alert - passwords sent back from server as input value)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-03-20 17:26:15

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.72&r2=1.73

--- conga/conga.spec.in.in	2007/03/20 17:01:16	1.72
+++ conga/conga.spec.in.in	2007/03/20 17:26:15	1.73
@@ -288,6 +288,8 @@
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
+- Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
+- Fixed bz228637 (CVE-2007-1462 security alert - passwords sent back from server as input value)
 - Fixed bz225558 (conga does not add fence_xvmd to cluster.conf)
 - Fixed bz215014 (luci failover domain forms are missing/empty)
 - Fixed bz225588 (luci web app does not enforce selection of fence port)

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2007-03-20 17:01:16

Modified files:
	.              : conga.spec.in.in 

Log message:
	Include python-devel in build environment

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.71&r2=1.72

--- conga/conga.spec.in.in	2007/03/20 16:38:29	1.71
+++ conga/conga.spec.in.in	2007/03/20 17:01:16	1.72
@@ -36,9 +36,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-%if "%{include_zope_and_plone}" == "yes"
 BuildRequires: python-devel >= 2.4.1
-%endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 #BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2007-03-20 16:38:29

Modified files:
	.              : conga.spec.in.in 

Log message:
	file-devel was split from file.rpm

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.70&r2=1.71

--- conga/conga.spec.in.in	2007/02/16 15:54:46	1.70
+++ conga/conga.spec.in.in	2007/03/20 16:38:29	1.71
@@ -42,7 +42,7 @@
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 #BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
-BuildRequires: openssl-devel dbus-devel pkgconfig file
+BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
 
 
 %description
@@ -195,7 +195,7 @@
 # modrpm
 
 # modstorage
-Requires: parted util-linux
+Requires: parted util-linux file
 
 # modservice
 Requires: chkconfig initscripts

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-03-01 01:02:44

Modified files:
	.              : conga.spec.in.in 

Log message:
	Update the CFMPlone patch for the current version of Plone

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.24&r2=1.45.2.25

--- conga/conga.spec.in.in	2007/01/23 22:34:28	1.45.2.24
+++ conga/conga.spec.in.in	2007/03/01 01:02:43	1.45.2.25
@@ -31,7 +31,7 @@
 %if "%{include_zope_and_plone}" == "yes"
 Source1: @@ZOPE_ARCHIVE_TAR@@
 Source2: @@PLONE_ARCHIVE_TAR@@
-Patch2:  Plone-2.5_CMFPlone.patch
+Patch2: Plone-2.5.2-1_CMFPlone.patch
 %endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-02-16 15:55:44

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update and version bump

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.3&r2=1.67.2.4

--- conga/conga.spec.in.in	2007/02/05 22:01:23	1.67.2.3
+++ conga/conga.spec.in.in	2007/02/16 15:55:44	1.67.2.4
@@ -288,6 +288,19 @@
 
 %changelog
 
+* Fri Feb 16 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-5
+- Fixed bz228637 (security alert - passwords sent back from server as input value)
+- Fixed bz225558 (conga does not add fence_xvmd to cluster.conf)
+- Fixed bz215014 (luci failover domain forms are missing/empty)
+- Fixed bz225588 (luci web app does not enforce selection of fence port)
+- Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)
+- Fixed bz213083 (should display usernames in some logical/sorted order)
+- Fixed bz218964 (adding node to a cluster - confirm dialog displays cluster name in place of node name)
+- Fixed bz222051 (Combining reauthentication/deletion options in one luci display can cause user confusion)
+- Fixed bz225164 (Conga allows creation/rename of clusters with name greater than 15 characters)
+- Fixed bz227723 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before assignment)
+- Fixed bz223162 (Error trying to create a new fence device for a cluster node)
+
 * Mon Feb 05 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-4
 - Related: bz205522
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-02-16 15:54:46

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.69&r2=1.70

--- conga/conga.spec.in.in	2007/02/07 01:36:14	1.69
+++ conga/conga.spec.in.in	2007/02/16 15:54:46	1.70
@@ -290,6 +290,16 @@
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
+- Fixed bz225558 (conga does not add fence_xvmd to cluster.conf)
+- Fixed bz215014 (luci failover domain forms are missing/empty)
+- Fixed bz225588 (luci web app does not enforce selection of fence port)
+- Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)
+- Fixed bz213083 (should display usernames in some logical/sorted order)
+- Fixed bz218964 (adding node to a cluster - confirm dialog displays cluster name in place of node name)
+- Fixed bz222051 (Combining reauthentication/deletion options in one luci display can cause user confusion)
+- Fixed bz225164 (Conga allows creation/rename of clusters with name greater than 15 characters)
+- Fixed bz227723 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before assignment)
+- Fixed bz223162 (Error trying to create a new fence device for a cluster node)
 - luci storage: fix bytes->TB conversion
 - Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
 - Fixed bz217387 (luci - HTML error shows up in display (minor))

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2007-01-17 16:38:17

Modified files:
	.              : conga.spec.in.in 

Log message:
	Changelog updates

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.22&r2=1.45.2.23

--- conga/conga.spec.in.in	2007/01/17 16:36:51	1.45.2.22
+++ conga/conga.spec.in.in	2007/01/17 16:38:17	1.45.2.23
@@ -286,6 +286,7 @@
 
 * Wed Jan 17 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-29
 - Remove test accounts from Data.fs
+- Related: bz222223
 
 * Wed Jan 17 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-28
 - Updated docs

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-01-10 23:52:45

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.65&r2=1.66

--- conga/conga.spec.in.in	2006/12/22 18:06:05	1.65
+++ conga/conga.spec.in.in	2007/01/10 23:52:45	1.66
@@ -301,8 +301,9 @@
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
 - Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
 - Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails (not reproducible at will))
-- Improved bz212021 (various luci buttons do nothing)
-
+- Fixed bz212021 (various luci buttons do nothing)
+- Fixed bz212448 (release blocker: turn off debug mode of server)
+- Fixed bz212445 (release blocker: prevent management page access)
 
 * Fri Nov 17 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-1
 - Fixed bz212440 (luci persists possibly incorrect name for a system)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-01-10 23:51:59

Modified files:
	.              : conga.spec.in.in 

Log message:
	update the changelog to reflect the bugzilla issues resolved

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.18&r2=1.45.2.19

--- conga/conga.spec.in.in	2006/12/22 18:04:53	1.45.2.18
+++ conga/conga.spec.in.in	2007/01/10 23:51:59	1.45.2.19
@@ -293,7 +293,9 @@
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
 - Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
 - Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
-- Improved bz212021 (various luci buttons do nothing)
+- Fixed bz212021 (various luci buttons do nothing)
+- Fixed bz212448 (release blocker: turn off debug mode of server)
+- Fixed bz212445 (release blocker: prevent management page access)
 
 * Tue Dec 12 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-26
 - luci storage: fix bytes->TB conversion

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-22 18:06:05

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.64&r2=1.65

--- conga/conga.spec.in.in	2006/12/22 18:00:31	1.64
+++ conga/conga.spec.in.in	2006/12/22 18:06:05	1.65
@@ -284,7 +284,7 @@
 
 %changelog
 
-* Wed Dec 13 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-2
+* Fri Dec 22 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-2
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
@@ -300,7 +300,8 @@
 - Fixed bz217703 (clustered vg creation fails)
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
 - Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
-- Improved bz218040 (luci reports "unknown" as cluster name if cluster creation fails (not reproducible at will))
+- Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails (not reproducible at will))
+- Improved bz212021 (various luci buttons do nothing)
 
 
 * Fri Nov 17 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-1

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2006-12-22 18:04:53

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.17&r2=1.45.2.18

--- conga/conga.spec.in.in	2006/12/22 18:01:45	1.45.2.17
+++ conga/conga.spec.in.in	2006/12/22 18:04:53	1.45.2.18
@@ -284,7 +284,7 @@
 
 %changelog
 
-* Wed Dec 13 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-27
+* Fri Dec 22 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-27
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
@@ -292,10 +292,12 @@
 
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
 - Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
+- Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
+- Improved bz212021 (various luci buttons do nothing)
 
 * Tue Dec 12 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-26
 - luci storage: fix bytes->TB conversion
-- Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
+- Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (step 1 - backend)
 - Fixed bz217387 (luci - HTML error shows up in display (minor))
 - Fixed bz215031 (Cannot add a resource to a service via luci web app)
 - Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2006-12-22 18:01:45

Modified files:
	.              : conga.spec.in.in 

Log message:
	both parts of the certs work are done now; update the changelog entry to reflect this.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.16&r2=1.45.2.17

--- conga/conga.spec.in.in	2006/12/14 00:01:00	1.45.2.16
+++ conga/conga.spec.in.in	2006/12/22 18:01:45	1.45.2.17
@@ -295,7 +295,7 @@
 
 * Tue Dec 12 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-26
 - luci storage: fix bytes->TB conversion
-- Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (part 1 - backend)
+- Fixed bz201394 (luci doesn't verify ricci's SSL cert against trusted list)
 - Fixed bz217387 (luci - HTML error shows up in display (minor))
 - Fixed bz215031 (Cannot add a resource to a service via luci web app)
 - Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-14 18:28:14

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.62&r2=1.63

--- conga/conga.spec.in.in	2006/12/13 23:58:38	1.62
+++ conga/conga.spec.in.in	2006/12/14 18:28:14	1.63
@@ -300,7 +300,7 @@
 - Fixed bz217703 (clustered vg creation fails)
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
 - Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
-
+- Improved bz218040 (luci reports "unknown" as cluster name if cluster creation fails (not reproducible at will))
 
 
 * Fri Nov 17 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-1

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-13 23:58:38

Modified files:
	.              : conga.spec.in.in 

Log message:
	Changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.61&r2=1.62

--- conga/conga.spec.in.in	2006/12/13 19:33:14	1.61
+++ conga/conga.spec.in.in	2006/12/13 23:58:38	1.62
@@ -299,6 +299,7 @@
 - Fixed bz219156 (Errors in performing node-specific tasks due to ricci outage not reflected in luci display)
 - Fixed bz217703 (clustered vg creation fails)
 - Fixed bz214989 (Package download not working for Conga during cluster creation)
+- Fixed bz219522 (Restarting a cluster via luci web gui = UnboundLocalError - local variable 'e' referenced before assignment)
 
 
 

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	kupcevic at sourceware.org	2006-12-12 13:58:23

Modified files:
	.              : conga.spec.in.in 

Log message:
	Resolves entries

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.12&r2=1.45.2.13

--- conga/conga.spec.in.in	2006/12/12 13:53:53	1.45.2.12
+++ conga/conga.spec.in.in	2006/12/12 13:58:23	1.45.2.13
@@ -293,6 +293,8 @@
 - Fixed bz218941 (Conga/luci - cannot add node to cluster via luci web app)
 - Fixed bz219156 (Errors in performing node-specific tasks due to ricci outage not reflected in luci display)
 - Fixed bz217703 (clustered vg creation fails)
+- Resolves: bz217387, bz215031, bz218040, bz218941, bz219156, bz217703
+- Related: bz201394
 
 * Thu Nov 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-25
 - Fix build issues (D-BUS detection)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2006-12-12 05:21:35

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.9&r2=1.45.2.10

--- conga/conga.spec.in.in	2006/12/08 18:27:31	1.45.2.9
+++ conga/conga.spec.in.in	2006/12/12 05:21:34	1.45.2.10
@@ -292,7 +292,11 @@
 
 - luci storage: fix bytes->TB conversion
 - Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (part 1 - backend)
-
+- Fixed bz217387 (luci - HTML error shows up in display (minor))
+- Fixed bz215031 (Cannot add a resource to a service via luci web app)
+- Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)
+- Fixed bz218941 (Conga/luci - cannot add node to cluster via luci web app)
+- Fixed bz219156 (Errors in performing node-specific tasks due to ricci outage not reflected in luci display)
 
 * Thu Nov 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-25
 - Fix build issues (D-BUS detection)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-11 23:52:41

Modified files:
	.              : conga.spec.in.in 

Log message:
	updating the changelog

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.58&r2=1.59

--- conga/conga.spec.in.in	2006/12/08 20:47:37	1.58
+++ conga/conga.spec.in.in	2006/12/11 23:52:41	1.59
@@ -295,6 +295,8 @@
 - Fixed bz217387 (luci - HTML error shows up in display (minor))
 - Fixed bz215031 (Cannot add a resource to a service via luci web app)
 - Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)
+- Fixed bz218941 (Conga/luci - cannot add node to cluster via luci web app)
+- Fixed bz219156 (Errors in performing node-specific tasks due to ricci outage not reflected in luci display)
 
 
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-12-06 23:03:35

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.56&r2=1.57

--- conga/conga.spec.in.in	2006/12/06 22:34:09	1.56
+++ conga/conga.spec.in.in	2006/12/06 23:03:35	1.57
@@ -292,6 +292,9 @@
 
 - luci storage: fix bytes->TB conversion
 - Improved bz201394: luci doesn't verify ricci's SSL cert against trusted list (step 1 - backend)
+- Fixed bz217387 (luci - HTML error shows up in display (minor))
+- Fixed bz215031 (Cannot add a resource to a service via luci web app)
+- Fixed bz218040 (luci reports "unknown" as cluster name if cluster creation fails)
 
 
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-11-16 18:23:55

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog updates

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.51&r2=1.52

--- conga/conga.spec.in.in	2006/11/15 18:07:18	1.51
+++ conga/conga.spec.in.in	2006/11/16 18:23:55	1.52
@@ -289,6 +289,7 @@
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
+- Fixed bz212440 (luci persists possibly incorrect name for a system)
 - Fixed bz215039 (Cannot create a new resource via luci web app)
 - Fixed bz215034 (Cannot change daemon properties via luci web app)
 - Fixed bz214790 (Stop/restart cluster not working via luci web app)
@@ -307,7 +308,7 @@
 - Storage module: properly probe cluster quorum if LVM locking 
   is marked as clustered
 
-- #Resolves: bz215039, bz215034, bz214790, bz213690, bz213266
+- #Resolves: bz212440, bz215039, bz215034, bz214790, bz213690, bz213266
 - #Resolves: bz213083, bz212601, bz212021, bz212006, bz212584
 - #Related: bz213306
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-11-15 18:07:18

Modified files:
	.              : conga.spec.in.in 

Log message:
	changelog tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.50&r2=1.51

--- conga/conga.spec.in.in	2006/11/15 17:46:41	1.50
+++ conga/conga.spec.in.in	2006/11/15 18:07:18	1.51
@@ -299,19 +299,16 @@
 - Fixed bz212021 (various luci buttons do nothing)
 - Fixed bz212006 (create cluster does not show status as cluster is being created)
 - Fixed bz212584 (luci does not retrieve failed ricci queue elements)
-- Fixed bz212613 (luci - if node is already authenticated, user-supplied node password is ignored)
 - Improved bz213306 (ricci - log probing can take minutes to complete)
 - Fixed starting/stopping services
 - Fixed deleting cluster
 - Fixed deleting node
 - Fixed redirection for all async->busy wait calls
-- Fixed advanced cluster properties
 - Storage module: properly probe cluster quorum if LVM locking 
   is marked as clustered
 
 - #Resolves: bz215039, bz215034, bz214790, bz213690, bz213266
 - #Resolves: bz213083, bz212601, bz212021, bz212006, bz212584
-- #Resolves: bz212613
 - #Related: bz213306
 
 

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-21 23:22:14

Modified files:
	.              : conga.spec.in.in 

Log message:
	Disable rpmbuild's autoprov when including zope & plone
	(disable export of zope internals - this zope is for internal use only)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.34&r2=1.35

--- conga/conga.spec.in.in	2006/08/18 20:10:03	1.34
+++ conga/conga.spec.in.in	2006/08/21 23:22:14	1.35
@@ -92,7 +92,10 @@
 Requires: chkconfig initscripts
 %if "%{include_zope_and_plone}" == "yes"
 Requires: python >= 2.4.1
+Provides: config(luci) = %{version}-%{release}
+AutoProv: no
 %else
+AutoProv: yes
 Requires: python
 Requires: zope
 Requires: plone >= 2.5

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-18 20:10:03

Modified files:
	.              : conga.spec.in.in 

Log message:
	remove "extraneous" Provides

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- conga/conga.spec.in.in	2006/08/18 20:01:14	1.33
+++ conga/conga.spec.in.in	2006/08/18 20:10:03	1.34
@@ -182,24 +182,20 @@
 Requires: initscripts
 Requires: oddjob dbus openssl pam
 Requires: sed util-linux
-Requires: modcluster = %{version}-%{release}
+Requires: modcluster >= 0.8
 
 # modreboot
-Provides: ricci-modreboot = %{version}-%{release}
 
 # modrpm
-Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
 Requires: parted util-linux
-Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
 Requires: chkconfig initscripts
-Provides: ricci-modservice = %{version}-%{release}
 
 # modlog
-Provides: ricci-modlog = %{version}-%{release}
+
 
 Requires(pre): grep shadow-utils
 Requires(post): chkconfig initscripts util-linux

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-18 13:59:00

Modified files:
	.              : conga.spec.in.in 

Log message:
	- Don't auto-start ricci after installation; enable it, but don't start it
	- Fixes for the latest set of specfile complaints

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.31&r2=1.32

--- conga/conga.spec.in.in	2006/08/16 06:34:19	1.31
+++ conga/conga.spec.in.in	2006/08/18 13:59:00	1.32
@@ -39,7 +39,7 @@
 %if "%{include_zope_and_plone}" == "yes"
 BuildRequires: python-devel >= 2.4.1
 %endif
-BuildRequires: glibc-devel gcc-c++ libxml2-devel make
+BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 BuildRequires: openssl-devel dbus-devel pam-devel
 
 %description
@@ -62,22 +62,16 @@
 popd
 %endif
 
-
 %build
-rm -rf $RPM_BUILD_ROOT
-#./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
 %configure      --arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--include_zope_and_plone=%{include_zope_and_plone}
-#make %{?_smp_mflags}
-make conga
-
+make %{?_smp_mflags} conga
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install_conga
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -133,47 +127,44 @@
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
-if [ "B`/bin/grep luci\:x /etc/group`" = "B" ]; then
+if [ "B`/bin/grep luci\:x /etc/group`" == "B" ]; then
    /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
 fi
-if [ "B`/bin/grep luci\:x /etc/passwd`" = "B" ]; then
+if [ "B`/bin/grep luci\:x /etc/passwd`" == "B" ]; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 fi
 
 %post -n luci
-/sbin/chkconfig --list luci >/dev/null 2>&1
-if [ "1$?" != "10" ]; then
-   /sbin/chkconfig --add luci
-fi
+/sbin/chkconfig --add luci
 /sbin/service luci status >/dev/null 2>&1
 LUCI_RUNNING=$?
-if [ "1$LUCI_RUNNING" = "10" ]; then
+if [ "$LUCI_RUNNING" == "0" ]; then
    /sbin/service luci stop >/dev/null 2>&1
 fi
 if [ -e /var/lib/luci/var/luci_backup.xml ]; then
    # restore luci database
    /usr/sbin/luci_admin restore >/dev/null 2>&1
 fi
-if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
-   # no privkey.pem => luci not initialized => admin has default password
+# set initial admin password (if not already set) to random value
+if [ "B`cat /var/lib/luci/.admin_password_has_been_set`" != "BTrue" ]; then
    /usr/sbin/luci_admin password --random >/dev/null 2>&1
 fi
-if [ "1$LUCI_RUNNING" = "10" ]; then
+if [ "$LUCI_RUNNING" == "0" ]; then
    /sbin/service luci start >/dev/null 2>&1
 fi
 
 %preun -n luci
-if [ "$1" = "0" ]; then
+if [ "$1" == "0" ]; then
    /sbin/service luci stop >/dev/null 2>&1
    /sbin/chkconfig --del luci
 fi
 /sbin/service luci status >/dev/null 2>&1
 LUCI_RUNNING=$?
-if [ "1$LUCI_RUNNING" = "10" ]; then
+if [ "$LUCI_RUNNING" == "0" ]; then
    /sbin/service luci stop >/dev/null 2>&1
 fi
 /usr/sbin/luci_admin backup >/dev/null 2>&1
-if [ "1$LUCI_RUNNING" = "10" ]; then
+if [ "$LUCI_RUNNING" == "0" ]; then
    /sbin/service luci start >/dev/null 2>&1
 fi
 
@@ -211,7 +202,7 @@
 Provides: ricci-modlog = %{version}-%{release}
 
 Requires(pre): grep shadow-utils
-Requires(post): chkconfig initscripts util-linux sed SysVinit
+Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts util-linux
 
@@ -253,40 +244,32 @@
 			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
-if [ "B`/bin/grep ricci\:x /etc/group`" = "B" ]; then
+if [ "B`/bin/grep ricci\:x /etc/group`" == "B" ]; then
    /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
 fi
-if [ "B`/bin/grep ricci\:x /etc/passwd`" = "B" ]; then
+if [ "B`/bin/grep ricci\:x /etc/passwd`" == "B" ]; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 fi
 
 %post -n ricci
-/sbin/chkconfig --list ricci >/dev/null 2>&1
-if [ "1$?" != "10" ]; then
-   /sbin/chkconfig --add ricci
-fi
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-
-# start ricci only if explicitly enabled (in current runlevel)
-RUNS=(`/sbin/runlevel`)
-RUNLEVEL=${RUNS[1]}
-STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-if [ "1$STATE" = "1on" ]; then
-   /sbin/service ricci start > /dev/null 2>&1
-fi
+/sbin/chkconfig --add ricci
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` >/dev/null 2>&1
+/sbin/service oddjobd reload >/dev/null 2>&1
 
 %preun -n ricci
-/sbin/service ricci stop > /dev/null 2>&1
-if [ "1$1" = "10" ]; then
+if [ "$1" == "0" ]; then
+   /sbin/service ricci stop > /dev/null 2>&1
    /sbin/chkconfig --del ricci
 fi
 
 %postun -n ricci
-if [ "1$1" = "10" ]; then
-   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+if [ "$1" == "0" ]; then
+   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
    /sbin/service oddjobd reload > /dev/null 2>&1
 fi
+if [ "$1" == "1" ]; then
+   /sbin/service ricci condrestart > /dev/null 2>&1
+fi
 
 
 
@@ -296,6 +279,11 @@
 
 
 %changelog
+* Fri Aug 18 2006 Stanko Kupcevic <kupcevic@redhat.com> 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   
+
 * Wed Aug 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.7
 - Move ricci-modrpm, ricci-modlog, ricci-modstorage, ricci-modservice
    from /usr/sbin to /usr/libexec

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-25 21:00:40

Modified files:
	.              : conga.spec.in.in 

Log message:
	Last build with plone 2.1.2

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- conga/conga.spec.in.in	2006/07/25 19:50:59	1.18
+++ conga/conga.spec.in.in	2006/07/25 21:00:40	1.19
@@ -118,8 +118,8 @@
 Requires: python >= 2.4.1
 %else
 Requires: python
-Requires: zope >= 2.9
-Requires: plone >= 2.5
+Requires: zope
+Requires: plone
 %endif
 Requires: openssl mailcap stunnel 
 Requires: sed util-linux
@@ -474,6 +474,7 @@
 %changelog
 * Tue Jul 25 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-8
 - New build with a lot of implementation details on Luci
+- Last build with plone 2.1.2
 * Thu Jul 06 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-7
 - More compliant specfile, minor fixes
 * Tue Jun 27 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-6

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-17 22:57:41

Modified files:
	.              : conga.spec.in.in 

Log message:
	conga.spec: init scripts are not config files, do not mark them as such

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- conga/conga.spec.in.in	2006/07/06 20:35:06	1.15
+++ conga/conga.spec.in.in	2006/07/17 22:57:41	1.16
@@ -95,8 +95,8 @@
 
 %files -n luci
 %defattr(-,root,root)
-%config(noreplace)		%{_sysconfdir}/rc.d/init.d/luci
 %config(noreplace)		%{_sysconfdir}/sysconfig/luci
+				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
 				%{_docdir}/luci-%{version}/
 %defattr(-,luci,root)
@@ -199,10 +199,10 @@
 %files -n ricci
 %defattr(-,root,root)
 # ricci
-%config(noreplace)	%{_sysconfdir}/rc.d/init.d/ricci
 %config(noreplace)	%{_sysconfdir}/pam.d/ricci
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci
 %attr(-,ricci,root)	%{_localstatedir}/lib/ricci
 			%{_sbindir}/ricci
 %attr(4755,root,root)	%{_sbindir}/ricci-auth
@@ -299,9 +299,9 @@
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
-%config(noreplace)	%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/ricci-modclusterd
 			%{_sbindir}/ricci-modcluster
 			%{_sbindir}/ricci-modcluster.exe
 			%{_sbindir}/ricci-modclusterd

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-07-05 22:08:16

Modified files:
	.              : conga.spec.in.in 

Log message:
	set ricci/luci home folders to /var/lib/...

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- conga/conga.spec.in.in	2006/07/05 21:33:46	1.13
+++ conga/conga.spec.in.in	2006/07/05 22:08:16	1.14
@@ -107,7 +107,7 @@
 
 %pre -n luci
 /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g luci luci >/dev/null 2>&1
+/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 exit 0
 
 %post -n luci
@@ -234,7 +234,7 @@
 
 %pre -n ricci
 /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
-/usr/sbin/useradd -r -M -s /sbin/nologin -g ricci ricci >/dev/null 2>&1
+/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 exit 0
 
 %post -n ricci

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-30 22:12:34

Modified files:
	.              : conga.spec.in.in 

Log message:
	towards FC compliant specfile: Requires & Provides

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- conga/conga.spec.in.in	2006/06/28 21:42:43	1.11
+++ conga/conga.spec.in.in	2006/06/30 22:12:34	1.12
@@ -79,11 +79,9 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Management Station (https frontend)
 Requires: chkconfig initscripts
-Requires: /bin/bash
 Requires: python zope plone
 Requires: openssl mailcap stunnel
-Requires: ricci 
-Provides: luci 
+Requires: ricci = %{version}-%{release}
 
 
 %description -n luci
@@ -167,30 +165,26 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Managed Station (dispatcher daemon, including basic management modules)
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob dbus libxml2 openssl pam
-Requires: ricci = %{version}-%{release}
-Requires: ricci-modrpm = %{version}-%{release}
-Requires: ricci-modstorage = %{version}-%{release}
-Requires: ricci-modservice = %{version}-%{release}
-Requires: ricci-modlog = %{version}-%{release}
+Requires: oddjob dbus openssl pam
+Requires: sed
 Requires: ricci-modcluster = %{version}-%{release}
 
-Provides: ricci ricci-modreboot 
+# modreboot
+Provides: ricci-modreboot = %{version}-%{release}
 
 # modrpm
-Provides: ricci-modrpm 
+Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
 Requires: parted
-Provides: ricci-modstorage
+Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
 Requires: chkconfig initscripts
-Provides: ricci-modservice
+Provides: ricci-modservice = %{version}-%{release}
 
 # modlog
-Provides: ricci-modlog
+Provides: ricci-modlog = %{version}-%{release}
 
 %description -n ricci
 Conga is a project developing management system for remote stations. 
@@ -252,9 +246,9 @@
 fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ $STATE = "on" ]; then
    /sbin/service ricci restart > /dev/null 2>&1
 fi
@@ -269,9 +263,9 @@
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
 if [ "$1" -ge "1" ]; then
-   RUNS=(`runlevel`)
+   RUNS=(`/sbin/runlevel`)
    RUNLEVEL=${RUNS[1]}
-   STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+   STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
    if [ $STATE = "on" ]; then
       /sbin/service ricci restart > /dev/null 2>&1
    fi
@@ -288,9 +282,8 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Managed Clustered Station (cluster management module)
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modcluster
+Requires: oddjob openssl
+Requires: sed
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -315,9 +308,9 @@
 /sbin/chkconfig --add ricci-modclusterd
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
@@ -345,10 +338,9 @@
 %package -n cluster-snmp
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-Requires: /bin/bash
-Requires: net-snmp ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-snmp
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: net-snmp 
+Requires: oddjob openssl
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
@@ -362,6 +354,7 @@
 			%{_docdir}/cluster-snmp-%{version}/
 
 %pre -n cluster-snmp
+exit 0
 
 %post -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -370,6 +363,7 @@
 exit 0
 
 %preun -n cluster-snmp
+exit 0
 
 %postun -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -387,10 +381,9 @@
 %package -n cluster-cim
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-Requires: /bin/bash
-Requires: tog-pegasus ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-cim
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: tog-pegasus 
+Requires: oddjob openssl
 Conflicts: clumon-cim
 
 %description -n cluster-cim
@@ -402,6 +395,7 @@
 %{_docdir}/cluster-cim-%{version}/
 
 %pre -n cluster-cim
+exit 0
 
 %post -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -410,6 +404,7 @@
 exit 0
 
 %preun -n cluster-cim
+exit 0
 
 %postun -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-28 21:42:43

Modified files:
	.              : conga.spec.in.in 

Log message:
	RPM summaries

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- conga/conga.spec.in.in	2006/06/27 21:46:14	1.10
+++ conga/conga.spec.in.in	2006/06/28 21:42:43	1.11
@@ -32,7 +32,7 @@
 License: GPL
 
 Group: System Environment/Base
-Summary: conga source rpm
+Summary: Conga Remote Management System - source code
 
 Source: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -77,7 +77,7 @@
 
 %package -n luci
 Group: System Environment/Base
-Summary: luci
+Summary: Conga Remote Management System - Management Station (https frontend)
 Requires: chkconfig initscripts
 Requires: /bin/bash
 Requires: python zope plone
@@ -165,7 +165,7 @@
 
 %package -n ricci
 Group: System Environment/Base
-Summary: Remote management system, including basic management modules
+Summary: Conga Remote Management System - Managed Station (dispatcher daemon, including basic management modules)
 Requires: chkconfig initscripts
 Requires: /bin/bash
 Requires: oddjob dbus libxml2 openssl pam
@@ -286,7 +286,7 @@
 
 %package -n ricci-modcluster
 Group: System Environment/Base
-Summary: ricci-modcluster summary
+Summary: Conga Remote Management System - Managed Clustered Station (cluster management module)
 Requires: chkconfig initscripts
 Requires: /bin/bash
 Requires: oddjob libxml2 openssl

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

[kupcevic]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-27 21:46:15

Modified files:
	.              : conga.spec.in.in 

Log message:
	Luci upgrade failure fix

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- conga/conga.spec.in.in	2006/06/27 21:15:30	1.9
+++ conga/conga.spec.in.in	2006/06/27 21:46:14	1.10
@@ -146,7 +146,7 @@
 if [ "$LUCI_RUNNING" = "0" ]; then
    /sbin/service luci start >/dev/null 2>$1
 fi
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/service luci stop >/dev/null 2>$1
    /sbin/chkconfig --del luci
 fi
@@ -155,6 +155,7 @@
 if [ "$1" -ge "1" ]; then
    /sbin/service luci condrestart > /dev/null 2>&1
 fi
+exit 0
 
 
 
@@ -259,7 +260,7 @@
 fi
 
 %preun -n ricci
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/service ricci stop > /dev/null 2>&1
    /sbin/chkconfig --del ricci
 fi
@@ -317,12 +318,12 @@
 RUNS=(`runlevel`)
 RUNLEVEL=${RUNS[1]}
 STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
-if [ $STATE = "on" ]; then
+if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
 
 %preun -n ricci-modcluster
-if [ "$1" = 0 ]; then
+if [ "$1" = "0" ]; then
    /sbin/service ricci-modclusterd stop > /dev/null 2>&1
    /sbin/chkconfig --del ricci-modclusterd
 fi