[Cluster-devel] conga ./conga.spec.in.in make/version.in

[kupcevic at sourceware.org]

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

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 

Log message:
	Luci persists users/clusters/systems/permissions across upgrades; version bump to 0.8-6

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/conga.spec.in.in	2006/06/19 21:21:54	1.8
+++ conga/conga.spec.in.in	2006/06/27 21:15:30	1.9
@@ -42,7 +42,13 @@
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-conga source rpm
+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 source code of Conga and 
+Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider. 
+
 
 %prep
 %setup -q
@@ -81,8 +87,11 @@
 
 
 %description -n luci
-luci description
-This package contains Luci website
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains Luci website.
 
 
 %files -n luci
@@ -103,20 +112,40 @@
 
 %post -n luci
 /sbin/chkconfig --add luci
+if [ -e /var/lib/luci/var/luci_backup.xml ]; then
+   /sbin/service luci status >/dev/null 2>$1
+   LUCI_RUNNING=$?
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci stop >/dev/null 2>$1
+   fi
+   /usr/sbin/luci_admin restore >/dev/null 2>$1
+   if [ "$LUCI_RUNNING" = "0" ]; then
+      /sbin/service luci start >/dev/null 2>$1
+   fi
+fi
 if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
-	# no privkey.pem -> luci not initialized
-	# set initial random admin password
-	T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
-	for i in $T_PASS; do
-	   if [ "-" != $i ] ; then
-		echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
-	   fi
-	done
-	/bin/chmod 600 /var/lib/luci/inituser
-	/bin/chown luci /var/lib/luci/inituser
+   # no privkey.pem -> luci not initialized
+   # set initial random admin password
+   T_PASS=`dd if=/dev/urandom bs=5M count=1 2> /dev/null | sha1sum`
+   for i in $T_PASS; do
+      if [ "-" != $i ] ; then
+	echo -n "admin:{SHA}$i" > /var/lib/luci/inituser
+      fi
+   done
+   /bin/chmod 600 /var/lib/luci/inituser
+   /bin/chown luci /var/lib/luci/inituser
 fi
 
 %preun -n luci
+/sbin/service luci status >/dev/null 2>$1
+LUCI_RUNNING=$?
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci stop >/dev/null 2>$1
+fi
+/usr/sbin/luci_admin backup >/dev/null 2>$1
+if [ "$LUCI_RUNNING" = "0" ]; then
+   /sbin/service luci start >/dev/null 2>$1
+fi
 if [ "$1" = 0 ]; then
    /sbin/service luci stop >/dev/null 2>$1
    /sbin/chkconfig --del luci
@@ -163,9 +192,12 @@
 Provides: ricci-modlog
 
 %description -n ricci
-ricci description
-Remote management system. 
-This package contains listening daemon, as well as reboot, rpm, storage, service and log management modules. 
+Conga is a project developing management system for remote stations. 
+It consists of luci, https frontend, and ricci, secure daemon that dispatches 
+incoming messages to underlying management modules. 
+
+This package contains listening daemon (dispatcher), as well as 
+reboot, rpm, storage, service and log management modules. 
 
 
 %files -n ricci
@@ -261,7 +293,12 @@
 Conflicts: clumon
 
 %description -n ricci-modcluster
-ricci-modcluster 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. 
+
+This package contains Red Hat Enterprise Linux Cluster Suite ricci management module. 
+
 
 %files -n ricci-modcluster
 %defattr(-,root,root)
@@ -314,7 +351,7 @@
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite
+SNMP agent for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-snmp
 %defattr(-,root,root)
@@ -356,7 +393,7 @@
 Conflicts: clumon-cim
 
 %description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-cim
 %defattr(-,root,root)
@@ -388,13 +425,15 @@
 
 
 %changelog
+* Tue Jun 27 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-6
+- Luci persists users/clusters/systems/permissions across upgrades 
 * Fri Jun 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-4
 - Moved storage, service, log and rpm modules into main ricci.rpm.
 * Wed Jun 14 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-1
 - Packaged cluster-snmp (cluster snmp agent)
 - Packaged cluster-cim (cluster CIM provider)
 * Mon Jun 06 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.7-5
-- Disable non-https access to Luci, enable https on port 8181
+- Disable non-https access to Luci, enable https on port 8084
 * Mon Jun 02 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.7-1
 - Packaged Luci - ricci's www frontend
 - Added logging module
--- conga/make/version.in	2006/06/19 21:21:54	1.6
+++ conga/make/version.in	2006/06/27 21:15:31	1.7
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=5.FC6
+RELEASE=6