[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./Makefile ./autogen.sh ./configure ./co ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic sourceware org	2006-08-09 20:53:22

Modified files:
	.              : Makefile autogen.sh configure conga.spec.in.in 
	ricci          : Makefile TODO 
	ricci/modules  : Makefile 
	ricci/modules/cluster: ClusterStatus.cpp Makefile 
	ricci/modules/cluster/clumon/init.d: Makefile 
	ricci/modules/cluster/clumon/src/daemon: Makefile 
Added files:
	.              : clustermon.spec.in.in 
	ricci/modules/cluster: modcluster 
	ricci/modules/cluster/clumon/init.d: modclusterd 
	ricci/modules/cluster/d-bus: modcluster.oddjob.conf 
	                             modcluster.systembus.conf 
Removed files:
	ricci/modules/cluster: ricci-modcluster 
	ricci/modules/cluster/clumon/init.d: ricci-modclusterd 
	ricci/modules/cluster/d-bus: ricci-modcluster.oddjob.conf 
	                             ricci-modcluster.systembus.conf 

Log message:
	split conga.srpm into two srpms:
	- conga.srpm      - builds luci and ricci (including all modules except modcluster)
	- clustermon.srpm - builds modcluster, cluster-cim and cluster-snmp

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/configure.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/TODO.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/modcluster.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ricci-modcluster.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/modclusterd.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/init.d/ricci-modclusterd.diff?cvsroot=cluster&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Makefile.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/modcluster.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE

/cvs/cluster/conga/clustermon.spec.in.in,v  -->  standard output
revision 1.1
--- conga/clustermon.spec.in.in
+++ -	2006-08-09 20:53:22.828973000 +0000
@@ -0,0 +1,244 @@
+###############################################################################
+###############################################################################
+##
+##  Copyright (C) 2006 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.
+##
+###############################################################################
+###############################################################################
+
+%define vers @@VERS@@
+%define rel  @@REL@@%{?dist}
+
+
+%define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
+
+
+############  SRPM  ###################
+
+
+Name: clustermon
+Version: %vers
+Release: %rel
+License: GPL
+URL: http://sources.redhat.com/cluster/conga
+
+Group: System Environment/Base
+Summary: cluster snmp agent, cim provider and ricci module - source code
+
+Source0: %{name}-%{version}.tar.gz
+Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+
+
+BuildRequires: glibc-devel gcc-c++ libxml2-devel make
+BuildRequires: openssl-devel dbus-devel pam-devel
+BuildRequires: net-snmp-devel tog-pegasus-devel
+
+%description
+This package contains source code of 
+Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider. 
+
+
+%prep
+%setup -q
+
+
+%build
+rm -rf $RPM_BUILD_ROOT
+#./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
+%configure      --arch=%{_arch} \
+		--docdir=%{_docdir} \
+		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
+		--include_zope_and_plone=no
+#make %{?_smp_mflags}
+make clustermon
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install_clustermon
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+
+
+###  cluster module  ###
+
+
+%package -n modcluster
+Group: System Environment/Base
+Summary: Red Hat Enterprise Linux Cluster Suite - ricci module
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: chkconfig initscripts
+Requires: oddjob openssl
+Requires: sed util-linux
+Conflicts: clumon
+Conflicts: ricci-modcluster
+
+%description -n modcluster
+ricci management module for Red Hat Enterprise Linux Cluster Suite.
+
+
+%files -n modcluster
+%defattr(-,root,root)
+%config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/modcluster.oddjob.conf
+%config(noreplace)	%{_sysconfdir}/dbus-1/system.d/modcluster.systembus.conf
+			%{_sysconfdir}/rc.d/init.d/modclusterd
+			%{_sbindir}/modcluster
+			%{_sbindir}/modcluster.exe
+			%{_sbindir}/modclusterd
+			%{_docdir}/modcluster-%{version}/
+
+%post -n modcluster
+/sbin/chkconfig --add modclusterd
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+/sbin/service oddjobd reload > /dev/null 2>&1
+RUNS=(`/sbin/runlevel`)
+RUNLEVEL=${RUNS[1]}
+STATE=`/sbin/chkconfig --list modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+if [ "$STATE" = "on" ]; then
+   /sbin/service modclusterd restart > /dev/null 2>&1
+fi
+
+%preun -n modcluster
+if [ "$1" = "0" ]; then
+   /sbin/service modclusterd stop > /dev/null 2>&1
+   /sbin/chkconfig --del modclusterd
+fi
+
+%postun -n modcluster
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+/sbin/service oddjobd reload > /dev/null 2>&1
+if [ "$1" -ge "1" ]; then
+   /sbin/service modclusterd condrestart > /dev/null 2>&1
+fi
+exit 0
+
+
+
+
+###  cluster-snmp  ###
+
+
+%package -n cluster-snmp
+Group: System Environment/Base
+Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: modcluster = %{version}-%{release}
+Requires: net-snmp 
+Requires: oddjob openssl
+Conflicts: clumon-snmp
+
+%description -n cluster-snmp
+SNMP agent for Red Hat Enterprise Linux Cluster Suite.
+
+%files -n cluster-snmp
+%defattr(-,root,root)
+			%{_libdir}/cluster-snmp/
+			%{_datadir}/snmp/mibs/REDHAT-MIB
+			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
+			%{_docdir}/cluster-snmp-%{version}/
+
+%pre -n cluster-snmp
+exit 0
+
+%post -n cluster-snmp
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+#/sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/service snmpd condrestart > /dev/null 2>&1
+exit 0
+
+%preun -n cluster-snmp
+exit 0
+
+%postun -n cluster-snmp
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+#/sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/service snmpd condrestart > /dev/null 2>&1
+exit 0
+
+
+
+
+
+###  cluster-cim  ###
+
+
+%package -n cluster-cim
+Group: System Environment/Base
+Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
+URL: http://sources.redhat.com/cluster/conga
+
+Requires: modcluster = %{version}-%{release}
+Requires: tog-pegasus 
+Requires: oddjob openssl
+Conflicts: clumon-cim
+
+%description -n cluster-cim
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
+
+%files -n cluster-cim
+%defattr(-,root,root)
+			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
+			%{_docdir}/cluster-cim-%{version}/
+
+%pre -n cluster-cim
+exit 0
+
+%post -n cluster-cim
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+#/sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/service tog-pegasus condrestart > /dev/null 2>&1
+exit 0
+
+%preun -n cluster-cim
+exit 0
+
+%postun -n cluster-cim
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+#/sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/service tog-pegasus condrestart > /dev/null 2>&1
+exit 0
+
+
+
+
+
+
+###  changelog ###
+
+
+%changelog
+* Thu Aug 03 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-10
+- Luci: fix login issues, add cluster resources, styling... 
+* Wed Jul 26 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-9
+- Update Luci to Plone 2.5
+* 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
+- Luci persists users/clusters/systems/permissions across upgrades 
+* Fri Jun 16 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-4
+- Moved storage, service, log and rpm modules into main ricci.rpm
+* Wed Jun 14 2006 Stanko Kupcevic <kupcevic redhat com> 0.8-1
+- Packaged cluster-snmp (cluster snmp agent)
+- Packaged cluster-cim (cluster CIM provider)
+* Mon Jun 06 2006 Stanko Kupcevic <kupcevic redhat com> 0.7-5
+- Disable non-https access to Luci, enable https on port 8084
+* Mon Jun 02 2006 Stanko Kupcevic <kupcevic redhat com> 0.7-1
+- Packaged Luci - ricci's www frontend
+- Added logging module
+* Mon May 26 2006 Stanko Kupcevic <kupcevic redhat com> 0.6-1
+- Multitude of fixes and new features
+* Mon Apr 10 2006 Stanko Kupcevic <kupcevic redhat com> 0.5-1
+- First official build of conga project
--- conga/Makefile	2006/07/25 22:01:52	1.7
+++ conga/Makefile	2006/08/09 20:53:21	1.8
@@ -13,36 +13,67 @@
 
 TMP_DIR=..
 CONGA_DIRNAME=conga-${VERSION}
+CLUSTERMON_DIRNAME=clustermon-${VERSION}
 
+.PHONY: conga ricci luci clustermon
 
 
-all:
+all: conga clustermon
+	echo "Run 'make install' to install conga and clustermon"
+
+conga: luci ricci
+	echo "Run 'make install_conga' to install conga"
+
+ricci:
 	make -C ricci
+
+luci:
 	make -C luci
-	echo "Run 'make install' to install conga (ricci and luci)"
 
+clustermon:
+	make -C ricci clustermon
+	echo "Run 'make install_clustermon' to install modcluster, cluster-cim and cluster-snmp"
+
+
+install: install_conga install_clustermon
+
+install_conga: install_ricci install_luci 
+
+install_ricci:
+	make -C ricci install_ricci
 
-install: 
-	make -C ricci install
+install_luci:
 	make -C luci install
 
+install_clustermon: 
+	make -C ricci install_clustermon
 
-clean:
+
+clean: clean_ricci clean_luci clean_clustermon
+
+clean_ricci:
 	make -C ricci clean
+
+clean_luci:
 	make -C luci clean
 
+clean_clustermon:
+	make -C ricci clean_clustermon
+
 
 distclean: 
 	make -C ricci distclean
 	make -C luci distclean
 	rm -f conga.spec conga.spec.in
-	rm -f conga*.tar.gz conga*.src.rpm
+	rm -f conga*.tar.gz conga*.src.rpm clustermon*.tar.gz clsutermon*.src.rpm
 
 
 rebuild: clean all
 
 
-srpm: clean
+srpms: srpm_conga srpm_clustermon
+
+srpm_conga: clean
 	rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
 	cp -r . ${TMP_DIR}/${CONGA_DIRNAME}
 	rm -rf `find ${TMP_DIR}/${CONGA_DIRNAME} -name CVS`
@@ -51,3 +82,18 @@
 	tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
 	rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
 	rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec
+
+srpm_clustermon: clean
+	rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
+	cp -r . ${TMP_DIR}/${CLUSTERMON_DIRNAME}
+	rm -rf `find ${TMP_DIR}/${CLUSTERMON_DIRNAME} -name CVS`
+	rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*gz
+	rm -f ${TMP_DIR}/${CLUSTERMON_DIRNAME}/*.rpm
+	./luci/utils/remove_files ${TMP_DIR}/${CLUSTERMON_DIRNAME} ricci/ricci ricci/modules/log ricci/modules/service ricci/modules/rpm ricci/modules/storage luci/site luci/storage luci/cluster luci/homebase luci/plone-custom
+	tar -zcf ${CLUSTERMON_DIRNAME}.tar.gz ${TMP_DIR}/${CLUSTERMON_DIRNAME}
+	rm -rf ${TMP_DIR}/${CLUSTERMON_DIRNAME}
+	rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs clustermon.spec
+
+rpms: srpms
+	rpmbuild --rebuild ${CONGA_DIRNAME}-${RELEASE}.src.rpm
+	rpmbuild --rebuild ${CLUSTERMON_DIRNAME}-${RELEASE}.src.rpm
--- conga/autogen.sh	2006/07/24 20:17:01	1.3
+++ conga/autogen.sh	2006/08/09 20:53:21	1.4
@@ -18,6 +18,7 @@
 done
 if [ "$INCLUDE_ZOPE_PLONE" = "" ] ; then
     echo 'please define "include_zope_and_plone" as yes or no'
+    echo "(zope and plone are not used if building clustermon only)"
     echo "    eg: $0 --include_zope_and_plone=yes" 
     exit 1
 fi
@@ -94,11 +95,17 @@
     | sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
     > conga.spec
 
+cat clustermon.spec.in.in \
+    | sed -e s/@@VERS@@/$VERSION/g \
+    | sed -e s/@@REL@@/$RELEASE/g \
+    > clustermon.spec
+
 
 cd ricci ; ./autogen.sh $@ ; cd ..
 cd luci ; ./autogen.sh $@ ; cd ..
 
 
 echo ""
-echo "Run \`./configure\` to configure conga build, "
-echo "or \`make srpm\` to build srpm."
+echo "Run \`./configure\` to configure conga build,"
+echo "or \`make srpms\` to build conga and clustermon srpms"
+echo "or \`make rpms\` to build all rpms"
--- conga/configure	2006/07/24 20:17:01	1.3
+++ conga/configure	2006/08/09 20:53:21	1.4
@@ -13,7 +13,9 @@
     exit 2
 fi
 
-echo "Run 'make' to compile conga"
+echo "Run 'make' to compile conga and clustermon"
+echo "Run 'make conga' to compile conga"
+echo "Run 'make clustermon' to compile clustermon"
 
 
 exit 0
--- conga/conga.spec.in.in	2006/08/08 18:11:26	1.26
+++ conga/conga.spec.in.in	2006/08/09 20:53:21	1.27
@@ -53,7 +53,6 @@
 %endif
 BuildRequires: glibc-devel gcc-c++ libxml2-devel make
 BuildRequires: openssl-devel dbus-devel pam-devel
-BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
 Conga is a project developing management system for remote stations. 
@@ -88,12 +87,12 @@
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=%{include_zope_and_plone}
 #make %{?_smp_mflags}
-make
+make conga
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install_conga
 
 
 %clean
@@ -204,7 +203,7 @@
 Requires: chkconfig initscripts
 Requires: oddjob dbus openssl pam
 Requires: sed util-linux
-Requires: ricci-modcluster = %{version}-%{release}
+Requires: modcluster = %{version}-%{release}
 
 # modreboot
 Provides: ricci-modreboot = %{version}-%{release}
@@ -311,154 +310,6 @@
 
 
 
-###  cluster module  ###
-
-
-%package -n ricci-modcluster
-Group: System Environment/Base
-Summary: Conga Remote Management System - Managed Clustered Station
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: chkconfig initscripts
-Requires: oddjob openssl
-Requires: sed util-linux
-Conflicts: clumon
-
-%description -n ricci-modcluster
-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)
-%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
-			%{_docdir}/ricci-modcluster-%{version}/
-
-%post -n ricci-modcluster
-/sbin/chkconfig --add ricci-modclusterd
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`/sbin/runlevel`)
-RUNLEVEL=${RUNS[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
-
-%preun -n ricci-modcluster
-if [ "$1" = "0" ]; then
-   /sbin/service ricci-modclusterd stop > /dev/null 2>&1
-   /sbin/chkconfig --del ricci-modclusterd
-fi
-
-%postun -n ricci-modcluster
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-if [ "$1" -ge "1" ]; then
-   /sbin/service ricci-modclusterd condrestart > /dev/null 2>&1
-fi
-exit 0
-
-
-
-
-###  cluster-snmp  ###
-
-
-%package -n cluster-snmp
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: ricci-modcluster = %{version}-%{release}
-Requires: net-snmp 
-Requires: oddjob openssl
-Conflicts: clumon-snmp
-
-%description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite.
-
-%files -n cluster-snmp
-%defattr(-,root,root)
-			%{_libdir}/cluster-snmp/
-			%{_datadir}/snmp/mibs/REDHAT-MIB
-			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
-			%{_docdir}/cluster-snmp-%{version}/
-
-%pre -n cluster-snmp
-exit 0
-
-%post -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-snmp
-exit 0
-
-%postun -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
-
-
-
-
-
-###  cluster-cim  ###
-
-
-%package -n cluster-cim
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-URL: http://sources.redhat.com/cluster/conga
-
-Requires: ricci-modcluster = %{version}-%{release}
-Requires: tog-pegasus 
-Requires: oddjob openssl
-Conflicts: clumon-cim
-
-%description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite.
-
-%files -n cluster-cim
-%defattr(-,root,root)
-			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
-			%{_docdir}/cluster-cim-%{version}/
-
-%pre -n cluster-cim
-exit 0
-
-%post -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-cim
-exit 0
-
-%postun -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
-exit 0
-
-
-
-
-
 
 ###  changelog ###
 
--- conga/ricci/Makefile	2006/08/04 17:55:24	1.10
+++ conga/ricci/Makefile	2006/08/09 20:53:21	1.11
@@ -12,17 +12,24 @@
 #include make/version.in
 include make/defines.mk
 
+.PHONY: ricci
 
+all: ricci clustermon
 
-all: 
+ricci:
 	make -C common
 	make -C ricci
 	make -C modules
 	make -C init.d
 	make -C pam.d
 
+clustermon:
+	make -C common
+	make -C modules clustermon
+
+install: install_ricci install_clustermon
 
-install: 
+install_ricci: 
 	$(INSTALL_DIR) -m 700 ${localstatedir}/lib/ricci
 	make -C ricci install
 	make -C modules install
@@ -30,8 +37,11 @@
 	make -C pam.d install
 	$(INSTALL_DIR)  ${docdir}/ricci-${VERSION}/
 	$(INSTALL_FILE) COPYING ${docdir}/ricci-${VERSION}/
-	$(INSTALL_DIR)  ${docdir}/ricci-modcluster-${VERSION}/
-	$(INSTALL_FILE) COPYING ${docdir}/ricci-modcluster-${VERSION}/
+
+install_clustermon:
+	make -C modules install_clustermon
+	$(INSTALL_DIR)  ${docdir}/modcluster-${VERSION}/
+	$(INSTALL_FILE) COPYING ${docdir}/modcluster-${VERSION}/
 
 
 uninstall: 
@@ -43,6 +53,8 @@
 	make -C init.d clean
 	make -C pam.d clean
 
+clean_clustermon: 
+	make -C modules clean
 
 distclean: clean
 	rm -f make/defines.mk
--- conga/ricci/TODO	2006/07/12 23:29:51	1.4
+++ conga/ricci/TODO	2006/08/09 20:53:21	1.5
@@ -14,7 +14,7 @@
 	- cluster/node deployment
 	- XEN
 	- piranha & ipvs (piranha module?)
-	- ricci-modclusterd -> non-blocking IO
+	- modclusterd -> non-blocking IO
 	- implement RHEL5 cluster model (services, rpms, probes, ...)
 
  - Storage
--- conga/ricci/modules/Makefile	2006/06/02 00:14:29	1.4
+++ conga/ricci/modules/Makefile	2006/08/09 20:53:22	1.5
@@ -9,23 +9,28 @@
 ##############################################################################################################################################################
 
 
-
+.PHONY: clustermon
 
 all: 
 	make -C storage
-	make -C cluster
 	make -C rpm
 	make -C log
 	make -C service
 
 
+clustermon:
+	make -C cluster
+
+
 install: 
 	make -C storage install
-	make -C cluster install
 	make -C rpm install
 	make -C log install
 	make -C service install
 
+install_clustermon:
+	make -C cluster install
+
 uninstall: 
 
 clean:
/cvs/cluster/conga/ricci/modules/cluster/modcluster,v  -->  standard output
revision 1.1
--- conga/ricci/modules/cluster/modcluster
+++ -	2006-08-09 20:53:23.584962000 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# dirty hack to get rid of libxml parsing errors going to stderr
+#
+
+/bin/nice -n -1 $0.exe </dev/stdin 2>/dev/null
+
+exit $?
--- conga/ricci/modules/cluster/ClusterStatus.cpp	2006/07/20 08:29:49	1.8
+++ conga/ricci/modules/cluster/ClusterStatus.cpp	2006/08/09 20:53:22	1.9
@@ -67,7 +67,7 @@
     sock = s;
   } catch ( ... ) {
     // start clumon
-    run_initd("ricci-modclusterd", true, true);
+    run_initd("modclusterd", true, true);
     
     // wait for it to come up and sync
     sleep_sec(CLUMON_SYNC_TIME);
--- conga/ricci/modules/cluster/Makefile	2006/06/30 22:26:12	1.11
+++ conga/ricci/modules/cluster/Makefile	2006/08/09 20:53:22	1.12
@@ -14,7 +14,7 @@
 include ${top_srcdir}/make/defines.mk
 
 
-TARGET = ricci-modcluster.exe
+TARGET = modcluster.exe
 
 OBJECTS = main.o \
 	ClusterModule.o \
@@ -38,11 +38,11 @@
 install: 
 	$(INSTALL_DIR)  ${sbindir}
 	$(INSTALL_BIN)  ${TARGET} ${sbindir}
-	$(INSTALL_BIN)  ricci-modcluster ${sbindir}
+	$(INSTALL_BIN)  modcluster ${sbindir}
 	$(INSTALL_DIR)  ${sysconfdir}/oddjobd.conf.d
-	$(INSTALL_FILE) d-bus/ricci-modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+	$(INSTALL_FILE) d-bus/modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
 	$(INSTALL_DIR)  ${sysconfdir}/dbus-1/system.d
-	$(INSTALL_FILE) d-bus/ricci-modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
+	$(INSTALL_FILE) d-bus/modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
 	make -C clumon install
 
 uninstall: 
/cvs/cluster/conga/ricci/modules/cluster/clumon/init.d/modclusterd,v  -->  standard output
revision 1.1
--- conga/ricci/modules/cluster/clumon/init.d/modclusterd
+++ -	2006-08-09 20:53:24.090124000 +0000
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# Copyright (C) 2005 Red Hat, Inc.
+#
+# This program is Free Software.  You may modify and/or redistribute it under
+# the terms of the GNU General Public License version 2, or (at your option)
+# any later version.
+#
+# description:  Starts and stops Ricci Cluster Module - cluster monitor
+# chkconfig: 2345 99 01
+#
+
+# Source function library
+. /etc/init.d/functions
+
+# Grab the network config file
+. /etc/sysconfig/network
+
+# Grab cluster start config if it exists
+[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+export PATH
+
+ID="Cluster Module - cluster monitor"
+CLUMOND="modclusterd"
+CFG_FILE="/etc/cluster/cluster.conf"
+PIDFILE="/var/run/clumond.pid"
+LOCKFILE="/var/lock/subsys/modclusterd"
+
+#
+# Only root wants to run this...
+#
+[ `id -u` = 0 ] || exit 0
+
+#
+# If we're not configured, then don't start anything.
+#
+[ "${NETWORKING}" = "yes" ] || exit 0
+#[ -f "$CFG_FILE" ] || exit 0
+
+
+case $1 in
+	start)
+		echo -n $"Starting $ID: "
+		daemon $CLUMOND
+		rtrn=$?
+		if [ $rtrn -eq 0 ]; then
+		    touch $LOCKFILE
+		    /usr/bin/logger -t $CLUMOND "startup succeeded"
+		else
+		    /usr/bin/logger -t $CLUMOND "startup failed"
+		fi
+		echo
+		;;
+
+	restart)
+		$0 stop
+		sleep 8
+		$0 start 
+		rtrn=$?
+		;;
+
+	status)
+		status $CLUMOND
+		rtrn=$?
+		;;
+
+	stop)
+		echo -n "Shutting down $ID: "
+		killproc $CLUMOND SIGTERM
+		rtrn=$?
+		if [ $rtrn -eq 0 ]; then
+		    rm -f $PIDFILE
+		    rm -f $LOCKFILE
+		    /usr/bin/logger -t $CLUMOND "shutdown succeeded"
+		else
+		    /usr/bin/logger -t $CLUMOND "shutdown failed"
+		fi
+		rtrn=0
+		echo
+		;;
+
+        condrestart)
+               if [ -f ${PIDFILE} ] ; then
+		   $0 restart
+		   rtrn=$?
+	       fi
+	       ;;
+
+        reload)
+               rtrn=0
+	       ;;
+
+	*)
+		echo $"Usage: $0 {start|stop|reload|restart|status}"
+		rtrn=1
+		;;
+
+esac
+
+exit $rtrn
--- conga/ricci/modules/cluster/clumon/init.d/Makefile	2006/06/30 22:26:12	1.4
+++ conga/ricci/modules/cluster/clumon/init.d/Makefile	2006/08/09 20:53:22	1.5
@@ -12,7 +12,7 @@
 
 include ${top_srcdir}/make/defines.mk
 
-TARGET = ricci-modclusterd
+TARGET = modclusterd
 
 all:
 
--- conga/ricci/modules/cluster/clumon/src/daemon/Makefile	2006/06/30 22:26:13	1.4
+++ conga/ricci/modules/cluster/clumon/src/daemon/Makefile	2006/08/09 20:53:22	1.5
@@ -13,7 +13,7 @@
 
 include ${top_srcdir}/make/defines.mk
 
-TARGET = ricci-modclusterd
+TARGET = modclusterd
 
 OBJECTS = main.o \
 	Monitor.o Peer.o Communicator.o
/cvs/cluster/conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf,v  -->  standard output
revision 1.1
--- conga/ricci/modules/cluster/d-bus/modcluster.oddjob.conf
+++ -	2006-08-09 20:53:24.523441000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+	<service name="com.redhat.ricci">
+	<object name="/com/redhat/ricci">
+		<interface name="com.redhat.ricci">
+			<method name="modcluster_rw">
+				<helper exec="/usr/sbin/modcluster"
+					arguments="1"
+					prepend_user_name="no"
+					argument_passing_method="stdin"
+				/>
+				<allow user="root"/>
+			</method>
+			<method name="modcluster_ro">
+				<helper exec="/usr/sbin/modcluster_ro"
+					arguments="1"
+					prepend_user_name="no"
+					argument_passing_method="stdin"
+				/>
+				<allow user="root"/>
+			</method>
+		</interface>
+	</object>
+	</service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/cluster/d-bus/modcluster.systembus.conf,v  -->  standard output
revision 1.1
--- conga/ricci/modules/cluster/d-bus/modcluster.systembus.conf
+++ -	2006-08-09 20:53:24.605557000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+	  "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+	  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";>
+
+<busconfig>
+
+	<!-- Only root can own ricci service. -->
+	<policy user="root">
+		<allow own="com.redhat.ricci"/>
+	</policy>
+
+	<!-- Allow anyone to call modcluster_rw and modcluster_ro
+	     methods.  oddjobd performs actual ACL. -->
+	<policy context="default">
+		<allow send_destination="com.redhat.ricci"
+		       send_path="/com/redhat/ricci"
+		       send_interface="com.redhat.ricci"
+		       send_member="modcluster_rw"/>
+		<allow send_destination="com.redhat.ricci"
+		       send_path="/com/redhat/ricci"
+		       send_interface="com.redhat.ricci"
+		       send_member="modcluster_ro"/>
+	</policy>
+
+</busconfig>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]