From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...
Date: 11 Apr 2008 06:48:12 -0000 [thread overview]
Message-ID: <20080411064812.25708.qmail@sourceware.org> (raw)
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
next reply other threads:[~2008-04-11 6:48 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-11 6:48 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-29 19:47 [Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. rmccabe
2008-07-28 17:49 rmccabe
2008-05-12 15:13 rmccabe
2008-04-18 3:31 rmccabe
2008-04-11 6:54 rmccabe
2008-04-07 20:11 rmccabe
2008-02-12 17:40 rmccabe
2008-01-29 22:02 rmccabe
2007-08-20 16:23 rmccabe
2007-08-13 19:06 rmccabe
2007-08-09 22:02 rmccabe
2007-08-08 21:24 rmccabe
2007-06-27 7:43 rmccabe
2007-05-01 15:57 rmccabe
2007-04-11 20:15 rmccabe
2007-04-11 19:23 rmccabe
2007-03-20 20:52 kupcevic
2007-02-07 1:36 kupcevic
2007-02-05 22:01 kupcevic
2007-02-05 20:08 rmccabe
2007-02-05 12:12 kupcevic
2007-01-23 22:34 kupcevic
2007-01-17 16:36 kupcevic
2007-01-17 14:57 kupcevic
2007-01-17 14:32 kupcevic
2006-12-13 19:21 kupcevic
2006-12-12 13:53 kupcevic
2006-11-17 20:46 kupcevic
2006-11-17 0:59 kupcevic
2006-11-16 19:35 kupcevic
2006-11-02 0:46 rmccabe
2006-11-01 23:11 kupcevic
2006-11-01 20:43 rmccabe
2006-10-31 20:34 kupcevic
2006-10-25 18:47 rmccabe
2006-10-25 16:35 kupcevic
2006-10-16 21:01 kupcevic
2006-10-16 15:56 kupcevic
2006-10-04 16:32 kupcevic
2006-09-26 5:21 kupcevic
2006-08-22 23:01 kupcevic
2006-08-22 20:12 kupcevic
2006-08-16 6:34 kupcevic
2006-08-15 4:15 kupcevic
2006-08-09 21:13 kupcevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080411064812.25708.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).