* [Cluster-devel] conga ./Makefile ./autogen.sh ./configure ./co ...
@ 2006-07-24 20:17 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-07-24 20:17 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-07-24 20:17:02
Modified files:
. : Makefile autogen.sh configure conga.spec.in.in
luci : ChangeLog Makefile autogen.sh configure
load_site.py pack.py
luci/site : Makefile
luci/utils : luci_admin
ricci : autogen.sh
Added files:
. : download_files
luci/make : defines.mk.in
luci/site/luci/bin: runzope.in zopectl.in
luci/site/luci/etc: stunnel.conf.in zope.conf.in
Removed files:
luci/site/luci/bin: runzope zopectl
luci/site/luci/etc: stunnel.conf zope.conf
Log message:
Include zope and plone into rpm if
./autogen.sh --include_zope_and_plone=yes
and configure system accordingly
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/configure.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/ChangeLog.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/autogen.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/configure.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/pack.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/make/defines.mk.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/runzope.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/zopectl.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/runzope.diff?cvsroot=cluster&r1=1.3&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/zopectl.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/stunnel.conf.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/zope.conf.in.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/stunnel.conf.diff?cvsroot=cluster&r1=1.3&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/etc/zope.conf.diff?cvsroot=cluster&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.27&r2=1.28
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/autogen.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2
/cvs/cluster/conga/download_files,v --> standard output
revision 1.1
--- conga/download_files
+++ - 2006-07-24 20:17:03.706681000 +0000
@@ -0,0 +1,21 @@
+# define archive info for Zope and Plone
+# URLs is a space delimited list of urls to download from
+
+
+ZOPE_ARCHIVE=Zope-2.9.3
+ZOPE_MD5SUM=4e8b4e076cadd6eb62dd4513748cb9f9
+ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.3/Zope-2.9.3.tgz"
+
+
+# don't use 2.9.4 yet, try to track FC6 so we have as little changes as possible
+#ZOPE_ARCHIVE=Zope-2.9.4-final
+#ZOPE_MD5SUM=7d7ffe62eabc84d0c438e450e344c29f
+#ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz"
+
+
+
+PLONE_ARCHIVE=Plone-2.5
+PLONE_MD5SUM=0a385a1a4afbf940bb4e094ce5dcb583
+PLONE_URLs="http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \
+ http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz \
+ http://easynews.dl.sourceforge.net/sourceforge/plone/Plone-2.5.tar.gz"
--- conga/Makefile 2006/06/16 20:44:14 1.5
+++ conga/Makefile 2006/07/24 20:17:01 1.6
@@ -46,7 +46,9 @@
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
cp -r . ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf `find ${TMP_DIR}/${CONGA_DIRNAME} -name CVS`
+ rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*gz
+ rm -f ${TMP_DIR}/${CONGA_DIRNAME}/*.rpm
tar -zcf ${CONGA_DIRNAME}.tar.gz ${TMP_DIR}/${CONGA_DIRNAME}
rm -rf ${TMP_DIR}/${CONGA_DIRNAME}
- rpmbuild --define "_srcrpmdir ." --nodeps -ts ${CONGA_DIRNAME}.tar.gz
+ rpmbuild --define "_sourcedir ." --define "_srcrpmdir ." --nodeps -bs conga.spec
rm -rf ${CONGA_DIRNAME}.tar.gz
--- conga/autogen.sh 2006/06/16 20:44:14 1.2
+++ conga/autogen.sh 2006/07/24 20:17:01 1.3
@@ -3,17 +3,102 @@
# TODO: improve me
+
+. download_files
+
+INCLUDE_ZOPE_PLONE=""
+for arg in $@
+do
+ if [ "$arg" = "--include_zope_and_plone=yes" ] ; then
+ INCLUDE_ZOPE_PLONE="yes"
+ fi
+ if [ "$arg" = "--include_zope_and_plone=no" ] ; then
+ INCLUDE_ZOPE_PLONE="no"
+ fi
+done
+if [ "$INCLUDE_ZOPE_PLONE" = "" ] ; then
+ echo 'please define "include_zope_and_plone" as yes or no'
+ echo " eg: $0 --include_zope_and_plone=yes"
+ exit 1
+fi
+
+
+
+
+get_and_verify_archive()
+{
+ NAME=$1
+ MD5SUM=$2
+ shift 2
+ URLs=$@
+
+ if [ ! -e $NAME ] ; then
+ echo ; echo "$NAME not present, download it"
+ done="false"
+ for url in $URLs
+ do
+ if [ "$done" = "false" ] ; then
+ echo "Downloading $NAME from $url"
+ wget $url
+ if [ "$?" = "0" ] ; then
+ echo "$MD5SUM $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+ if [ "$?" = "0" ] ; then
+ echo "$NAME passed md5sum test"
+ done="true"
+ else
+ echo "$NAME failed md5sum test"
+ rm -f $NAME
+ echo "Trying next mirror in the list..."
+ fi
+ else
+ rm -f $NAME
+ echo "Trying next mirror in the list..."
+ fi
+ fi
+ done
+ if [ "$done" = "false" ] ; then
+ echo "No more mirrors to download $NAME from. exiting..."
+ exit 5
+ fi
+ else
+ echo "$MD5SUM $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+ if [ "$?" = "0" ] ; then
+ echo "$NAME passed md5sum test"
+ else
+ echo "$NAME failed md5sum test; remove it and try again"
+ exit 6
+ fi
+ fi
+}
+
+if [ "$INCLUDE_ZOPE_PLONE" = "yes" ] ; then
+ get_and_verify_archive \
+ $ZOPE_ARCHIVE.tgz \
+ $ZOPE_MD5SUM \
+ $ZOPE_URLs
+ get_and_verify_archive \
+ $PLONE_ARCHIVE.tar.gz \
+ $PLONE_MD5SUM \
+ $PLONE_URLs
+fi
+
+
+
. make/version.in
cat conga.spec.in.in \
| sed -e s/@@VERS@@/$VERSION/g \
| sed -e s/@@REL@@/$RELEASE/g \
+ | sed -e s/@@INCLUDE_ZOPE_AND_PLONE@@/$INCLUDE_ZOPE_PLONE/g \
+ | sed -e s/@@ZOPE_ARCHIVE@@/$ZOPE_ARCHIVE/g \
+ | sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
> conga.spec
-cd ricci ; ./autogen.sh ; cd ..
-cd luci ; ./autogen.sh ; cd ..
+cd ricci ; ./autogen.sh $@ ; cd ..
+cd luci ; ./autogen.sh $@ ; cd ..
-echo "Run \`./configure\` to configure conga build"
+echo ""
+echo "Run \`./configure\` to configure conga build, "
echo "or \`make srpm\` to build srpm."
--- conga/configure 2006/06/14 21:44:34 1.2
+++ conga/configure 2006/07/24 20:17:01 1.3
@@ -3,8 +3,15 @@
# TODO: implement me
-cd ricci ; ./configure $@ ; cd ..
-cd luci ; ./configure $@ ; cd ..
+cd ricci ; ./configure $@ ; ret=$? ; cd ..
+if [ "$ret" != "0" ]; then
+ exit 1
+fi
+
+cd luci ; ./configure $@ ; ret=$? ; cd ..
+if [ "$ret" != "0" ]; then
+ exit 2
+fi
echo "Run 'make' to compile conga"
--- conga/conga.spec.in.in 2006/07/17 22:57:41 1.16
+++ conga/conga.spec.in.in 2006/07/24 20:17:01 1.17
@@ -11,7 +11,14 @@
###############################################################################
%define vers @@VERS@@
-%define rel @@REL@@%{?dist}
+%define rel @@REL@@%{?dist}
+
+%define include_zope_and_plone @@INCLUDE_ZOPE_AND_PLONE@@
+%define zope_archive @@ZOPE_ARCHIVE@@
+%define plone_archive @@PLONE_ARCHIVE@@
+%define zope_archive_file %{zope_archive}.tgz
+%define plone_archive_file %{plone_archive}.tar.gz
+
%define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers
@@ -31,9 +38,19 @@
Group: System Environment/Base
Summary: Conga Remote Management System - source code
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+%if "%{include_zope_and_plone}" == yes
+Source1: %{zope_archive_file}
+Source2: %{plone_archive_file}
+Patch2: Plone-2.5_Marhsall_ro_file.patch
+%endif
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+
+%if "%{include_zope_and_plone}" == yes
+BuildRequires: python >= 2.4.1
+BuildRequires: python-devel >= 2.4.1
+%endif
BuildRequires: glibc-devel gcc-c++ libxml2-devel make
BuildRequires: openssl-devel dbus-devel pam-devel
BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -49,18 +66,37 @@
%prep
%setup -q
+%if "%{include_zope_and_plone}" == yes
+CURRENT_DIR=`pwd`
+# Zope
+%setup -q -T -D -a 1
+ln -s ../%{zope_archive} luci/zope
+# Plone
+%setup -q -T -D -a 2
+ln -s ../%{plone_archive} luci/plone
+cd luci/plone
+%patch2 -p1
+rm -rf Five README.txt
+cd $CURRENT_DIR
+%endif
+
%build
-#./autogen.sh
+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}
+%configure --arch=%{_arch} \
+ --docdir=%{_docdir} \
+ --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
+ --include_zope_and_plone=%{include_zope_and_plone}
#make %{?_smp_mflags}
make
+
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -77,9 +113,14 @@
Group: System Environment/Base
Summary: Conga Remote Management System - Management Station
URL: http://sources.redhat.com/cluster/conga
-
Requires: chkconfig initscripts
-Requires: python zope plone
+%if "%{include_zope_and_plone}" == yes
+Requires: python >= 2.4.1
+%else
+Requires: python
+Requires: zope >= 2.9
+Requires: plone >= 2.5
+%endif
Requires: openssl mailcap stunnel
Requires: sed util-linux
Requires: ricci = %{version}-%{release}
@@ -98,6 +139,9 @@
%config(noreplace) %{_sysconfdir}/sysconfig/luci
%{_sysconfdir}/rc.d/init.d/luci
%{_sbindir}/luci_admin
+%if "%{include_zope_and_plone}" == yes
+ %{_libdir}/luci/
+%endif
%{_docdir}/luci-%{version}/
%defattr(-,luci,root)
%{_localstatedir}/lib/luci
--- conga/luci/ChangeLog 2006/07/18 20:33:04 1.4
+++ conga/luci/ChangeLog 2006/07/24 20:17:01 1.5
@@ -1,4 +1,8 @@
+2006-07-24 Stanko Kupcevic <kupcevic@redhat.com>
+ * include zope and plone into rpm if
+ ../autogen.sh --include_zope_and_plone=yes
+ and configure system accordingly
2006-07-18 Stanko Kupcevic <kupcevic@redhat.com>
* storage: add icons to property dialogs
--- conga/luci/Makefile 2006/07/05 21:33:46 1.11
+++ conga/luci/Makefile 2006/07/24 20:17:01 1.12
@@ -1,7 +1,8 @@
-# $Id: Makefile,v 1.11 2006/07/05 21:33:46 kupcevic Exp $
+# $Id: Makefile,v 1.12 2006/07/24 20:17:01 kupcevic Exp $
ZOPEINSTANCE=/var/lib/luci
include ../make/version.in
+include make/defines.mk
all: luci
@@ -18,6 +19,15 @@
install:
+ if [ "${include_zope_and_plone}" = "yes" ] ; then \
+ cd zope ; \
+ ./configure --prefix=${libdir}/luci/zope --with-python=/usr/bin/python ; \
+ make ; \
+ make install ; \
+ fi
+ if [ "${include_zope_and_plone}" = "yes" ] ; then \
+ cp -R plone/* ${libdir}/luci/zope/lib/python/Products/ ; \
+ fi
make -C site install
make -C utils install
make -C init.d install
@@ -41,6 +51,7 @@
make -C init.d distclean
make -C sysconfig distclean
make -C docs distclean
+ rm -f make/defines.mk
all_old: tar
--- conga/luci/autogen.sh 2006/06/14 21:44:34 1.1
+++ conga/luci/autogen.sh 2006/07/24 20:17:01 1.2
@@ -3,4 +3,5 @@
# TODO: implement me
-exit 0
+# satisfy makes' includes
+cp make/defines.mk.in make/defines.mk
--- conga/luci/configure 2006/06/14 21:44:34 1.2
+++ conga/luci/configure 2006/07/24 20:17:01 1.3
@@ -1,7 +1,74 @@
#!/bin/bash
-# TODO: implement me
+# improve me
+MAKE_DEFINES=make/defines.mk
-exit 0
+
+
+INCLUDE_ZOPE_PLONE=""
+for arg in $@
+do
+ if [ "$arg" = "--include_zope_and_plone=yes" ] ; then
+ INCLUDE_ZOPE_PLONE="yes"
+ fi
+ if [ "$arg" = "--include_zope_and_plone=no" ] ; then
+ INCLUDE_ZOPE_PLONE="no"
+ fi
+done
+if [ "$INCLUDE_ZOPE_PLONE" = "" ] ; then
+ echo 'please define "include_zope_and_plone" as yes or no'
+ echo " eg: $0 --include_zope_and_plone=yes"
+ rm -f $MAKE_DEFINES
+ exit 1
+fi
+
+
+
+echo "# generated automaticaly by ./configure" > $MAKE_DEFINES
+echo "# modify make/defines.mk.in for permanent changes" >> $MAKE_DEFINES
+echo >> $MAKE_DEFINES
+cat ../make/version.in >> $MAKE_DEFINES
+echo >> $MAKE_DEFINES
+echo "# priority: 1. make's params, 2. configure's params, 3. default params" >> $MAKE_DEFINES
+echo >> $MAKE_DEFINES
+echo >> $MAKE_DEFINES
+
+echo "# configure's params:" >> $MAKE_DEFINES
+for arg in $@
+do
+ var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,`
+ var=`echo $var | sed -e s,?=\ /,?=\ \\${DESTDIR}/,`
+ echo $var >> $MAKE_DEFINES
+done
+
+
+
+LIBDIR_SED=\\/lib
+X86_64_TMP=`uname -a | grep x86_64`
+if [ "$X86_64_TMP" ]; then
+ LIBDIR_SED=\\/lib64
+fi
+
+ARCH=`uname -m`
+
+
+cat $MAKE_DEFINES.in \
+ | sed -e s,@@LIBDIR@@,$LIBDIR_SED,g \
+ | sed -e s,@@ARCH@@,$ARCH,g \
+ >> $MAKE_DEFINES
+
+
+if [ $INCLUDE_ZOPE_PLONE = "yes" ] ; then
+ if [ ! -d zope ] ; then
+ echo "missing zope directory, extract zope source-code into it and try again"
+ rm -f $MAKE_DEFINES
+ exit 2
+ fi
+ if [ ! -d plone ] ; then
+ echo "missing plone directory, extract plone source-code into it, apply patches and try again"
+ rm -f $MAKE_DEFINES
+ exit 3
+ fi
+fi
--- conga/luci/load_site.py 2006/07/11 14:51:45 1.8
+++ conga/luci/load_site.py 2006/07/24 20:17:01 1.9
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# $Id: load_site.py,v 1.8 2006/07/11 14:51:45 rmccabe Exp $
+# $Id: load_site.py,v 1.9 2006/07/24 20:17:01 kupcevic Exp $
##############################################################################
#
@@ -34,6 +34,10 @@
index_html=0
sys.path.extend((
+ '/usr/lib/luci/zope/lib/python',
+ '/usr/lib/luci/zope/lib/python/Products',
+ '/usr/lib64/luci/zope/lib/python',
+ '/usr/lib64/luci/zope/lib/python/Products',
'/usr/lib64/zope/lib64/python',
'/usr/lib64/zope/lib64/python/Products',
'/usr/lib64/zope/lib/python',
--- conga/luci/pack.py 2006/07/11 14:51:45 1.3
+++ conga/luci/pack.py 2006/07/24 20:17:01 1.4
@@ -1,9 +1,13 @@
#!/usr/bin/python
-# $Id: pack.py,v 1.3 2006/07/11 14:51:45 rmccabe Exp $
+# $Id: pack.py,v 1.4 2006/07/24 20:17:01 kupcevic Exp $
import os, sys, string
sys.path.extend((
+ '/usr/lib/luci/zope/lib/python',
+ '/usr/lib/luci/zope/lib/python/Products',
+ '/usr/lib64/luci/zope/lib/python',
+ '/usr/lib64/luci/zope/lib/python/Products',
'/usr/lib64/zope/lib64/python',
'/usr/lib64/zope/lib64/python/Products',
'/usr/lib64/zope/lib/python',
/cvs/cluster/conga/luci/make/defines.mk.in,v --> standard output
revision 1.1
--- conga/luci/make/defines.mk.in
+++ - 2006-07-24 20:17:05.360768000 +0000
@@ -0,0 +1,41 @@
+
+# default params:
+program-prefix ?=
+prefix ?= ${DESTDIR}/usr
+exec-prefix ?= ${DESTDIR}/usr
+bindir ?= ${exec-prefix}/bin
+sbindir ?= ${exec-prefix}/sbin
+sysconfdir ?= ${DESTDIR}/etc
+datadir ?= ${prefix}/share
+includedir ?= ${prefix}/include
+libdir ?= ${prefix}@@LIBDIR@@
+libexecdir ?= ${prefix}/libexec
+localstatedir ?= ${DESTDIR}/var
+sharedstatedir ?= ${prefix}/com
+mandir ?= ${datadir}/man
+infodir ?= ${datadir}/info
+docdir ?= ${datadir}/doc
+arch ?= @@ARCH@@
+
+
+#--build=i686-redhat-linux-gnu
+#--host=i686-redhat-linux-gnu
+#--target=i386-redhat-linux-gnu
+
+
+INSTALL_DIR = install -d
+INSTALL_FILE = install -m 644
+INSTALL_BIN = install
+INSTALL_LIB = install
+
+
+INCLUDE +=
+CFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
+CXXFLAGS += -Wall -Wno-unused -fPIC -g ${INCLUDE}
+LDFLAGS += -fPIC
+
+CC = gcc
+CXX = g++
+LD = g++
+RANLIB ?= ranlib
+
--- conga/luci/site/Makefile 2006/07/06 20:35:06 1.3
+++ conga/luci/site/Makefile 2006/07/24 20:17:02 1.4
@@ -1,7 +1,41 @@
+include ../make/defines.mk
-all:
+ifeq "${include_zope_and_plone}" "yes"
+ZOPE_HOME=${libdir}/luci/zope
+else
+ZOPE_HOME=${libdir}/zope
+endif
+
+
+all: build
+
+
+
+build:
+ cat luci/bin/runzope.in \
+ | sed -e s,@@ZOPE_HOME@@,${ZOPE_HOME},g \
+ | sed -e s,@@LUCI_HOME@@,${localstatedir}/lib/luci,g \
+ | sed -e s,@@PYTHON_BIN@@,${bindir}/python,g \
+ > luci/bin/runzope
+ chmod a+x luci/bin/runzope
+ cat luci/bin/zopectl.in \
+ | sed -e s,@@ZOPE_HOME@@,${ZOPE_HOME},g \
+ | sed -e s,@@LUCI_HOME@@,${localstatedir}/lib/luci,g \
+ | sed -e s,@@PYTHON_BIN@@,${bindir}/python,g \
+ > luci/bin/zopectl
+ chmod a+x luci/bin/zopectl
+ cat luci/etc/zope.conf.in \
+ | sed -e s,@@ZOPE_HOME@@,${ZOPE_HOME},g \
+ | sed -e s,@@LUCI_HOME@@,${localstatedir}/lib/luci,g \
+ | sed -e s,@@PYTHON_BIN@@,${bindir}/python,g \
+ > luci/etc/zope.conf
+ cat luci/etc/stunnel.conf.in \
+ | sed -e s,@@ZOPE_HOME@@,${ZOPE_HOME},g \
+ | sed -e s,@@LUCI_HOME@@,${localstatedir}/lib/luci,g \
+ | sed -e s,@@PYTHON_BIN@@,${bindir}/python,g \
+ > luci/etc/stunnel.conf
install:
@@ -12,7 +46,7 @@
install -d ${DESTDIR}/var/lib/luci/bin
# install `find luci/bin -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/bin
install luci/bin/runzope ${DESTDIR}/var/lib/luci/bin
- install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin
+# install luci/bin/zopectl ${DESTDIR}/var/lib/luci/bin
install -d ${DESTDIR}/var/lib/luci/etc
# install `find luci/etc -maxdepth 1 -type f` ${DESTDIR}/var/lib/luci/etc
@@ -46,7 +80,11 @@
clean:
+ rm -f luci/bin/runzope
+ rm -f luci/bin/zopectl
+ rm -f luci/etc/zope.conf
+ rm -f luci/etc/stunnel.conf
-distclean:
+distclean: clean
/cvs/cluster/conga/luci/site/luci/bin/runzope.in,v --> standard output
revision 1.1
--- conga/luci/site/luci/bin/runzope.in
+++ - 2006-07-24 20:17:05.591259000 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+PYTHON="@@PYTHON_BIN@@"
+
+ZOPE_HOME="@@ZOPE_HOME@@"
+
+INSTANCE_HOME="@@LUCI_HOME@@"
+CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
+
+if [ -d "$ZOPE_HOME/lib64/python" ]; then
+ SOFTWARE_HOME="$ZOPE_HOME/lib64/python"
+else
+ SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+fi
+
+PYTHONPATH="$SOFTWARE_HOME"
+
+export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
+
+ZOPE_RUN="$SOFTWARE_HOME/Zope2/Startup/run.py"
+
+exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
/cvs/cluster/conga/luci/site/luci/bin/zopectl.in,v --> standard output
revision 1.1
--- conga/luci/site/luci/bin/zopectl.in
+++ - 2006-07-24 20:17:05.725833000 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+PYTHON="@@PYTHON_BIN@@"
+
+ZOPE_HOME="@@ZOPE_HOME@@"
+
+INSTANCE_HOME="@@LUCI_HOME@@"
+CONFIG_FILE="$INSTANCE_HOME/etc/zope.conf"
+
+if [ -d "$ZOPE_HOME/lib64/python" ]; then
+ SOFTWARE_HOME="$ZOPE_HOME/lib64/python"
+else
+ SOFTWARE_HOME="$ZOPE_HOME/lib/python"
+fi
+
+PYTHONPATH="$SOFTWARE_HOME"
+
+export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
+
+ZDCTL="$SOFTWARE_HOME/Zope2/Startup/zopectl.py"
+
+exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@"
/cvs/cluster/conga/luci/site/luci/etc/stunnel.conf.in,v --> standard output
revision 1.1
--- conga/luci/site/luci/etc/stunnel.conf.in
+++ - 2006-07-24 20:17:06.499271000 +0000
@@ -0,0 +1,13 @@
+cert = @@LUCI_HOME@@/var/certs/https.pem
+key = @@LUCI_HOME@@/var/certs/https.key.pem
+setuid = luci
+chroot = @@LUCI_HOME@@/var/stunnel
+pid = /pid
+
+[https]
+# accept directive is replaced on each luci start
+# modify /etc/sysconfig/luci:LUCI_HTTPS_PORT to change https port
+accept = 8084
+connect = localhost:25639
+TIMEOUTclose = 0
+
/cvs/cluster/conga/luci/site/luci/etc/zope.conf.in,v --> standard output
revision 1.1
--- conga/luci/site/luci/etc/zope.conf.in
+++ - 2006-07-24 20:17:06.628134000 +0000
@@ -0,0 +1,984 @@
+###############################################################################
+# Welcome to Zope 2.
+###############################################################################
+#
+# This is the Zope configuration file. The Zope configuration file
+# shows what the default configuration directives are, and show
+# examples for each directive. To declare a directive, make sure that
+# you add it to a line that does not begin with '#'. Note that comments
+# are only allowed at the beginning of a line: you may not add comments
+# after directive text on the same line.
+#
+# Note for Developers
+# ===================
+#
+# This file is *not* auto-generated. If you create a new directive you
+# very likely want to include an example of how to use the new
+# directive in this file.
+#
+# You shouldn't modify 'zope.conf.in' to change
+# configuration. Instead, you should make a copy into 'zope.conf' and
+# modify that to avoid checking in changes to this file by mistake.
+
+# ZConfig "defines" used for later textual substitution
+
+%define INSTANCE @@LUCI_HOME@@
+%define ZOPE @@ZOPE_HOME@@
+%define SOFTWARE_HOME $ZOPE/lib/python
+
+
+# Directive: instancehome
+#
+# Description:
+# The path to the data files, local product files, import directory,
+# and Extensions directory used by Zope.
+#
+# Required (no default)
+#
+# Example:
+#
+# instancehome /home/chrism/projects/sessions
+
+instancehome $INSTANCE
+
+# Directive: clienthome
+#
+# Description:
+# The directory in which a running Zope's process identifier files are
+# placed.
+#
+# Default: $INSTANCE/var
+#
+# Example:
+#
+# clienthome /home/chrism/projects/sessions/var
+
+
+# Directive: path
+#
+# Description:
+# Name of a directory which should be inserted into the
+# the beginning of Python's module search path. This directive
+# may be specified as many times as needed to insert additional
+# directories. The set of directories specified is inserted into the
+# beginning of the module search path in the order which they are specified
+# here. Note that the processing of this directive may happen too late
+# under some circumstances; it is recommended that you use the PYTHONPATH
+# environment variable if using this directive doesn't work for you.
+#
+# Default: $INSTANCE/lib/python
+#
+# Example:
+#
+# path $INSTANCE/mypymodules
+path $INSTANCE/Extensions
+
+
+# Directive: products
+#
+# Description:
+# Name of a directory that contains additional Product packages. This
+# directive may be used as many times as needed to add additional
+# collections of products. Each directory identified will be
+# added to the __path__ of the Products package. All Products are
+# initialized in ascending alphabetical order by product name. If
+# two products with the same name exist in two Products directories,
+# the order in which the packages appear here defines the load
+# order. The master Products directory exists in Zope's software home,
+# and cannot be removed from the products path (and should not be added
+# to it here).
+#
+# Default: $INSTANCE/Products
+#
+# Example:
+#
+# products /home/chrism/projects/myproducts
+products $INSTANCE/Products
+products $SOFTWARE_HOME/Products
+
+
+# Directive: environment
+#
+# Description:
+# A section which can be used to define arbitrary key-value pairs
+# for use as environment variables during Zope's run cycle. It
+# is not recommended to set system-related environment variables such as
+# PYTHONPATH within this section.
+#
+# Default: unset
+#
+# Example:
+#
+# <environment>
+# MY_PRODUCT_ENVVAR foobar
+# </environment>
+
+# Directive: debug-mode
+#
+# Description:
+# A switch which controls several aspects of Zope operation useful for
+# developing under Zope. When debug mode is on:
+#
+# - The process will not detach from the controlling terminal
+#
+# - Errors in product initialization will cause startup to fail
+# (instead of writing error messages to the event log file).
+#
+# - Filesystem-based scripts such as skins, PageTemplateFiles, and
+# DTMLFiles can be edited while the server is running and the server
+# will detect these changes in real time. When this switch is
+# off, you must restart the server to see the changes.
+#
+# Setting this to 'off' when Zope is in a production environment is
+# encouraged, as it speeds execution (sometimes dramatically).
+#
+# Default: off
+#
+# Example:
+#
+# debug-mode on
+debug-mode on
+
+
+# Directive: effective-user
+#
+# Description:
+# If you intend to run Zope as the "root" user, you must supply this
+# directive with an effective username or userid number to which Zope
+# will 'suid' after the server ports are bound. This directive only
+# has effect under UNIX and if Zope is started as the root user.
+#
+# Default: unset
+#
+# Example:
+#
+# effective-user chrism
+effective-user luci
+
+
+# Directive: enable-product-installation
+#
+# Description:
+# If this directive is turned on, Zope performs 'product installation'
+# (the registration of Python modules in various Products directories)
+# at startup. Turning this off can speed Zope/ZEO startup time,
+# but it can also cause your Control_Panel Product list to become
+# desynchronized with the contents of your Products
+# directories. NOTE: Zope *must* be started at least once with
+# this directive set to "on" or you will receive an error. If using ZEO,
+# at least one ZEO client must be run with this directive set to "on"
+# once, the others can have it turned off.
+# NOTE: If your main storage is mounted read-only,
+# you must set this directive to "off".
+#
+# Default: on
+#
+# Example:
+#
+# enable-product-installation off
+
+# Directive: locale
+#
+# Description:
+# Enable locale (internationalization) support by supplying a locale
+# name to be used. See your operating system documentation for locale
+# information specific to your system. If your Python module does not
+# support the locale module, or if the requested locale is not
+# supported by your system, an error will be raised and Zope will not
+# start.
+#
+# Default: unset
+#
+# Example:
+#
+# locale fr_FR
+
+
+# Directive: datetime-format
+#
+# Description:
+# Set this variable either to "us" or "international" to force the
+# DateTime module to parse date strings either with
+# month-before-days-before-year ("us") or
+# days-before-month-before-year ("international"). The default
+# behaviour of DateTime (when this setting is left unset) is to
+# parse dates as US dates.
+#
+# Default: us
+#
+# Example:
+#
+# datetime-format international
+
+
+# Directive: zserver-threads
+#
+# Description:
+# Specify the number of threads that Zope's ZServer web server will use
+# to service requests. The default is 4.
+#
+# Default: 4
+#
+# Example:
+#
+# zserver-threads 10
+
+
+# Directive: python-check-interval
+#
+# Description:
+# Specify an integer representing the Python interpreter "check
+# interval" This interval determines how often the interpreter checks
+# for periodic things such as thread switches and signal handlers. The
+# Zope default is 500, but you may want to experiment with other values
+# in order to attempt to increae performance in your particular
+# environment.
+#
+# Default: 500
+#
+# Example:
+#
+# python-check-interval 1000
+
+
+# Directive: zserver-read-only-mode
+#
+# Description:
+# If this directive is set to 'on', it will cause Zope to inhibit the
+# creation of log files and pid files. Access and event log files will
+# be presented on standard output. Setting this directive 'on' causes
+# pcgi, fastcgi, and daemon-related directives to have no effect.
+#
+# Default: off
+#
+# Example:
+#
+# zserver-read-only-mode on
+
+
+# Directive: pid-filename
+#
+# Description:
+# The path to the file in which the Zope process id(s) will be written.
+# This defaults to client-home/Z2.pid.
+#
+# Default: CLIENT_HOME/Z2.pid
+#
+# Example:
+#
+# pid-filename /home/chrism/projects/sessions/var/Z2.pid
+
+
+# Directive: lock-filename
+#
+# Description:
+# The path to a "lock file" which will be locked by Zope while it's
+# running. This file is used by zopectl.py to determine if Zope is
+# currently running. This defaults to CLIENT_HOME/Z2.lock.
+#
+# Default: CLIENT_HOME/Z2.lock
+#
+# Example:
+#
+# lock-filename /home/chrism/projects/sessions/var/Z2.lock
+
+
+# Directive: mime-types
+#
+# Description:
+# Tells Zope about additional mime.types files that should be
+# loaded. The files have the same format as the mime.types file
+# distributed with Apache. The "mime-types" setting may be given
+# more than once in the configuration file.
+#
+# Example:
+#
+# mime-types $INSTANCE/etc/mime.types
+mime-types /etc/mime.types
+
+
+# Directive: structured-text-header-level
+#
+# Description:
+# Set the default starting HTML header level for structured text
+# documents. The default is 3, which implies that top-level headers
+# will be created with an <H3> tag.
+#
+# Default: 3
+#
+# Example:
+#
+# structured-text-header-level 1
+
+# Directive: rest-input-encoding
+#
+# Description:
+# Specifies the input encoding of re-StructuredText documents
+# (e.g. 'utf-8', 'iso-8859-15' or any other valid encoding recognized
+# by Python). The default is your Python's default encoding.
+#
+# Default: unset (uses system default)
+#
+# Example:
+#
+# rest-input-encoding iso-8859-15
+
+# Directive: rest-output-encoding
+#
+# Description:
+# Specifies the output encoding of re-StructuredText documents
+# (e.g. 'utf-8', 'iso-8859-15' or any other valid encoding recognized
+# by Python). The default is your Python's default encoding.
+#
+# Default: unset (uses system default)
+#
+# Example:
+#
+# rest-output-encoding iso-8859-15
+
+# Directive: rest-header-level
+#
+# Description:
+# Set the default starting HTML header level for restructured text
+# documents. The default is 3, which implies that top-level headers
+# will be created with an <H3> tag.
+#
+# Default: 3
+#
+# Example:
+#
+# rest-header-level 2
+
+# Directive: rest-language-code
+#
+# Description:
+# Language code used for some internal translations inside of the docutils
+# package and for DTD bibliographic elements mapping. See
+# lib/python/docutils/languages/ for a list of supported language codes.
+#
+# Default: en
+#
+# Example:
+#
+# rest-language-code de
+
+# Directive: cgi-environment
+#
+# Description:
+# A section which allows a user to define arbitrary key-value pairs for
+# use as the initial CGI environment variables. This is useful
+# when you want to proxy requests from another web server to Zserver,
+# and would like Zserver's CGI environment to reflect the CGI
+# environment of the other web server.
+#
+# Default: unset
+#
+# Example:
+#
+# <cgi-environment>
+# HTTPS_SERVER Foobar Server 1.0
+# HTTPS_PORT 443
+# </cgi-environment>
+
+<cgi-environment>
+ HTTPS ON
+</cgi-environment>
+
+
+# Directive: dns-server
+#
+# Description:
+# Specify the IP address of your DNS server in order to cause resolved
+# hostnames to be written to Zope's access log. By default, Zope will
+# not resolve hostnames unless this is set.
+#
+# Default: unset
+#
+# Example:
+#
+# dns-server 127.0.0.1
+
+
+# Directive: ip-address
+#
+# Description:
+# The default IP address on which Zope's various server protocol
+# implementations will listen for requests. If this is unset, Zope
+# will listen on all IP addresses supported by the machine. This
+# directive can be overridden on a per-server basis in the servers
+# section.
+#
+# Default: unset
+#
+# Example:
+#
+# ip-address 127.0.0.1
+
+
+# Directive: http-realm
+#
+# Description:
+# The HTTP "Realm" header value sent by this Zope instance. This value
+# often shows up in basic authentication dialogs.
+#
+# Default: Zope
+#
+# Example:
+#
+# http-realm Slipknot
+
+
+# Directive: cgi-maxlen
+#
+# Description:
+# Set this value to limit the amount of form data being processed
+# by Zope to prevent DoS attacks.
+#
+# Default: 0 (= no restrictions)
+#
+# Example:
+#
+# cgi-maxlen 10000
+
+
+# Directive: http-header-max-length
+#
+# Description:
+# Maximum number of bytes allowed within a HTTP request header. The request
+# is discarded and considered as a DoS attack if the header size exceeds
+# this limit.
+#
+# Default: 8192
+#
+# Example:
+#
+# http-header-max-length 16384
+
+
+# Directive: automatically-quote-dtml-request-data
+#
+# Description:
+# Set this directive to 'off' in order to disable the autoquoting of
+# implicitly retrieved REQUEST data by DTML code which contains a '<'
+# when used in <dtml-var> construction. When this directive is 'on',
+# all data implicitly retrieved from the REQUEST in DTML (as opposed to
+# addressing REQUEST.somevarname directly) that contains a '<' will be
+# HTML-quoted when interpolated via a <dtml-var> or &dtml- construct. This
+# mitigates the possibility that DTML programmers will leave their
+# sites open to a "client-side trojan" attack.
+#
+# Default: on
+#
+# Example:
+#
+# automatically-quote-dtml-request-data on
+
+# Directive: trusted-proxy
+#
+# Description:
+# Define one or more 'trusted-proxies' directives, each of which is a
+# hostname or an IP address. The set of definitions comprises a list
+# of front-end proxies that are trusted to supply an accurate
+# X-Forwarded-For header to Zope. If a connection comes from
+# a trusted proxy, Zope will trust any X-Forwarded header to contain
+# the user's real IP address for the purposes of address-based
+# authentication restriction.
+#
+# Default: unset
+#
+# Example:
+#
+# trusted-proxy www.example.com
+# trusted-proxy 192.168.1.1
+
+# Directive: publisher-profile-file
+#
+# Description:
+# Names a file on the filesystem which causes Zope's Python
+# profiling capabilities to be enabled. For more information, see
+# the Debug Information - > Profiling tab of Zope's Control_Panel
+# via the Zope Management Interface. IMPORTANT: setting this
+# filename will cause Zope code to be executed much more slowly
+# than normal. This should not be enabled in production.
+#
+# Default: unset
+#
+# Example:
+#
+# publisher-profile-file $INSTANCE/var/profile.dat
+
+
+# Directive: security-policy-implementation
+#
+# Description:
+# The default Zope security machinery is implemented in C. Change
+# this to "python" to use the Python version of the Zope security
+# machinery. This setting may impact performance but is useful
+# for debugging purposes. See also the "verbose-security" option
+# below.
+#
+# Default: C
+#
+# Example:
+#
+#security-policy-implementation python
+
+# Directive: skip-authentication-checking
+#
+# Description:
+# Set this directive to 'on' to cause Zope to skip checks related
+# to authentication, for servers which serve only anonymous content.
+# Only works if security-policy-implementation is 'C'.
+#
+# Default: off
+#
+# Example:
+#
+# skip-authentication-checking on
+
+
+# Directive: skip-ownership-checking
+#
+# Description:
+# Set this directive to 'on' to cause Zope to ignore ownership checking
+# when attempting to execute "through the web" code. By default, this
+# directive is on in order to prevent 'trojan horse' security problems
+# whereby a user with less privilege can cause a user with more
+# privilege to execute dangerous code.
+#
+# Default: off
+#
+# Example:
+#
+# skip-ownership-checking on
+
+
+# Directive: verbose-security
+#
+# Description:
+# By default, Zope reports authorization failures in a terse manner in
+# order to avoid revealing unnecessary information. This option
+# modifies the Zope security policy to report more information about
+# the reason for authorization failures. It's designed for debugging.
+# If you enable this option, you must also set the
+# 'security-policy-implementation' to 'python'.
+#
+# Default: off
+#
+# Example:
+#
+# security-policy-implementation python
+# verbose-security on
+
+
+# Directive: maximum-number-of-session-objects
+#
+# Description:
+# An integer value representing the number of items to use as a
+# "maximum number of subobjects" value of the
+# '/temp_folder/session_data' transient object container.
+#
+# Default: 1000
+#
+# Example:
+#
+# maximum-number-of-session-objects 10000
+
+
+# Directive: session-add-notify-script-path
+#
+# Description:
+# An optional fill Zope path name of a callable object to be set as the
+# "script to call on object addition" of the sessioN_data transient
+# object container created in the /temp_folder folder at startup.
+#
+# Default: unset
+#
+# Example:
+#
+# session-add-notify-script-path /scripts/add_notifier
+
+
+# Directive: session-delete-notify-script-path
+#
+# Description:
+# An optional fill Zope path name of a callable object to be set as the
+# "script to call on object deletion" of the sessioN_data transient
+# object container created in the /temp_folder folder at startup.
+#
+# Default: unset
+#
+# Example:
+#
+# session-delete-notify-script-path /scripts/del_notifier
+
+
+# Directive: session-timeout-minutes
+#
+# Description:
+# An integer value representing the number of minutes to be used as the
+# "data object timeout" of the '/temp_folder/session_data' transient
+# object container.
+#
+# Default: 20
+#
+# Example:
+#
+# session-timeout-minutes 30
+
+
+# Directive: session-resolution-seconds
+#
+# Description:
+# An integer value representing the number of seconds to be used as the
+# "timeout resolution" of the '/temp_folder/session_data' transient
+# object container.
+#
+# Default: 20
+#
+# Example:
+#
+# session-resolution-seconds 60
+
+
+# Directive: suppress-all-access-rules
+#
+# Description:
+# If this directive is set to on, no access rules in your Zope site
+# will be executed. This is useful if you "lock yourself out" of a
+# particular part of your site by setting an improper access rule.
+#
+# Default: off
+#
+# Example:
+#
+# suppress-all-access-rules on
+
+
+# Directive: suppress-all-site-roots
+#
+# Description:
+# If this directive is set to on, no site roots in your Zope site will
+# be effective. This is useful if you "lock yourself out" of a
+# particular part of your site by setting an improper site root.
+#
+# Default: off
+#
+# Example:
+#
+# suppress-all-site-roots on
+
+
+# Directive: database-quota-size
+#
+# Description:
+# Set this directive to an integer in bytes in order to place a hard
+# limit on the size which the default FileStorage-backed Zope database
+# can grow. Additions to the database will not be permitted once this
+# filesize is exceeded.
+#
+# Default: unset
+#
+# Example:
+#
+# database-quota-size 1000000
+
+
+# Directive: read-only-database
+#
+# Description:
+# This causes the main Zope FileStorage-backed ZODB to be opened in
+# read-only mode.
+#
+# Default: off
+#
+# Example:
+#
+# read-only-database on
+
+
+# Directive: zeo-client-name
+#
+# Description:
+# If you want a persistent ZEO client cache which retains cache
+# contents across ClientStorage restarts, you need to define a
+# zeo-client-name. If you use ZEO and you don't set a
+# zeo-client-name, the client cache is stored in temporary files
+# which are removed when the ClientStorage shuts down. The value
+# of zeo-client-name is used to uniquely identify the local cache
+# files created if this Zope is a ZEO client.
+#
+# Default: unset
+#
+# Example:
+#
+# zeo-client-name zeo1
+
+
+# Directives: logger
+#
+# Description:
+# This area should define one or more "logger" sections of the
+# names "access", "event", and "trace". The "access" logger logs
+# Zope server access. The "event" logger logs Zope event
+# information. The "trace" logger logs detailed server request
+# information (for debugging purposes only). Each logger section
+# may contain a "level" name/value pair which indicates the level
+# of logging detail to capture for this logger. The default level
+# is INFO. Level may be any of "CRITICAL", 'ERROR", WARN", "INFO",
+# "DEBUG", and "ALL". Each logger section may additionally contain
+# one or more "handler" sections which indicates a types of log
+# "handlers" (file, syslog, NT event log, etc) to be used for the
+# logger being defined. There are 5 types of handlers: logfile,
+# syslog, win32-eventlog, http-handler, email-notifier. Each
+# handler type has its own set of allowable subkeys which define
+# aspects of the handler. All handler sections also allow for the
+# specification of a "format" (the log message format string), a
+# "dateformat" (the log message format for date strings), and a
+# "level", which has the same semantics of the overall logger
+# level but overrides the logger's level for the handler it's
+# defined upon. XXXX much more detail necessary here
+#
+# Default:
+#
+# The access log will log to the file <instancehome>/log/Z2.log at
+# level INFO, the event log will log to the file
+# <instancehome>/log/event.log at level INFO, and the trace log
+# will not be written anywhere.
+
+<eventlog>
+ level info
+ <logfile>
+ path $INSTANCE/log/event.log
+ level info
+ </logfile>
+</eventlog>
+
+<logger access>
+ level WARN
+ <logfile>
+ path $INSTANCE/log/Z2.log
+ format %(message)s
+ </logfile>
+</logger>
+
+# <logger trace>
+# level WARN
+# <logfile>
+# path $INSTANCE/log/trace.log
+# format %(message)s
+# </logfile>
+# </logger>
+
+
+# Directive: warnfilter
+#
+# Description:
+# A section that allows you to define a warning filter.
+# The following keys are valid within a warnfilter section:
+#
+# action: one of the following strings:
+#
+# "error" turn matching warnings into exceptions
+# "ignore" never print matching warnings
+# "always" always print matching warnings
+# "default" print the first occurrence of matching warnings
+# for each location where the warning is issued
+# "module" print the first occurrence of matching warnings
+# for each module where the warning is issued
+# "once" print only the first occurrence of matching
+# warnings, regardless of location
+#
+# message: a string containing a regular expression that the
+# warning message must match (the match is compiled to
+# always be case-insensitive)
+#
+# category: a Python dotted-path classname (must be a subclass of
+# Warning) of which the warning category must be a subclass in
+# order to match
+#
+# module: a string containing a regular expression that the
+# module name must match (the match is compiled to be
+# case-sensitive)
+#
+# lineno: an integer that the line number where the warning
+# occurred must match, or 0 to match all line numbers
+#
+# All keys within a warnfilter section are optional. More than
+# one warnfilter section may be specified.
+#
+# Default: unset
+#
+# Example:
+#
+# <warnfilter>
+# action ignore
+# category exceptions.DeprecationWarning
+# </warnfilter>
+
+
+# Directive: max-listen-sockets
+#
+# Description:
+# The maximum number of sockets that ZServer will attempt to open
+# in order to service incoming connections.
+#
+# Default: 1000
+#
+# Example:
+#
+# max-listen-sockets 500
+
+
+# Directives: port-base
+#
+# Description:
+# Offset applied to the port numbers used for ZServer
+# configurations. For example, if the http-server port is 8080 and
+# the port-base is 1000, the HTTP server will listen on port 9080.
+# This makes it easy to change the complete set of ports used by a
+# Zope server process
+#
+# Default:
+#
+# 0
+#
+# Example:
+#
+# port-base 1000
+
+
+# Directive: large-file-threshold
+#
+# Description:
+# Requests bigger than this size get saved into a temporary file
+# instead of being read completely into memory.
+#
+# Default: 512K
+#
+# Example:
+#
+# large-file-threshold 1Mb
+
+# Directive: default_zpublisher_encoding
+#
+# Description:
+# This controls what character set is used to encode unicode
+# data that reaches ZPublisher without any other specified encoding.
+#
+# Default: iso-8859-15
+#
+# Example:
+#
+# default_zpublisher_encoding utf-8
+
+# Directives: servers
+#
+# Description:
+# A set of sections which allow the specification of Zope's various
+# ZServer servers. 7 different server types may be defined:
+# http-server, ftp-server, webdav-source-server, persistent-cgi,
+# fast-cgi, monitor-server, and icp-server. If no servers are
+# defined, the default servers are used.
+#
+# Ports may be specified using the 'address' directive either in simple
+# form (80) or in complex form including hostname 127.0.0.1:80. If the
+# hostname is "left off", the default-ip-address is used as the hostname.
+#
+# Port numbers are offset by the setting of port-base.
+#
+# To run the monitor-server an emergency user must be defined
+# (through an 'access' file).
+#
+# Default:
+#
+# An HTTP server starts on port 8080.
+
+<http-server>
+ # valid keys are "address" and "force-connection-close"
+ #address 8080
+ address localhost:25639
+ # force-connection-close on
+</http-server>
+
+# Examples:
+#
+# <ftp-server>
+# # valid key is "address"
+# address 8021
+# </ftp-server>
+#
+# <webdav-source-server>
+# # valid keys are "address" and "force-connection-close"
+# address 1980
+# force-connection-close off
+# </webdav-source-server>
+#
+# <persistent-cgi>
+# # valid key is "path"
+# path somefile
+# </persistent-cgi>
+#
+# <fast-cgi>
+# # valid key is "address"; the address may be hostname:port, port,
+# # or a path for a Unix-domain socket
+# address somefile
+# </fast-cgi>
+#
+# <monitor-server>
+# # valid keys are "address"
+# address 8099
+# </monitor-server>
+#
+# <icp-server>
+# # valid key is "address"
+# address 888
+# </icp-server>
+
+
+# Database (zodb_db) section
+#
+# Description:
+# A database section allows the definition of custom database and
+# storage types. More than one zodb_db section can be defined.
+#
+# Default: unset.
+# IMPORTANT: At least one database with a mount-point of "/"
+# must be specified for Zope to start properly.
+
+<zodb_db main>
+ # Main FileStorage database
+ <filestorage>
+ path $INSTANCE/var/Data.fs
+ </filestorage>
+ mount-point /
+</zodb_db>
+
+<zodb_db temporary>
+ # Temporary storage database (for sessions)
+ <temporarystorage>
+ name temporary storage for sessioning
+ </temporarystorage>
+ mount-point /temp_folder
+ container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>
+
+# Other storage examples
+#
+# ZEO client storage:
+#
+# <zodb_db main>
+# mount-point /
+# # ZODB cache, in number of objects
+# cache-size 5000
+# <zeoclient>
+# server localhost:8100
+# storage 1
+# name zeostorage
+# var $INSTANCE/var
+# # ZEO client cache, in bytes
+# cache-size 20MB
+# # Uncomment to have a persistent disk cache
+# #client zeo1
+# </zeoclient>
+# </zodb_db>
--- conga/luci/utils/luci_admin 2006/07/11 18:46:47 1.27
+++ conga/luci/utils/luci_admin 2006/07/24 20:17:02 1.28
@@ -8,6 +8,10 @@
from xml.dom import minidom
sys.path.extend((
+ '/usr/lib/luci/zope/lib/python',
+ '/usr/lib/luci/zope/lib/python/Products',
+ '/usr/lib64/luci/zope/lib/python',
+ '/usr/lib64/luci/zope/lib/python/Products',
'/usr/lib64/zope/lib64/python',
'/usr/lib64/zope/lib/python',
'/usr/lib/zope/lib/python',
@@ -18,9 +22,11 @@
from Products import __path__
__path__.extend((
+ '/usr/lib/luci/zope/lib/python/Products',
+ '/usr/lib64/luci/zope/lib/python/Products',
'/usr/lib64/zope/lib/python/Products',
'/usr/lib64/zope/lib64/python/Products',
- '/usr/lib/zope/lib/python/Products',
+ '/usr/lib/zope/lib/python/Products'
))
LUCI_INIT_DEBUG = 0
--- conga/ricci/autogen.sh 2006/06/14 21:44:34 1.1
+++ conga/ricci/autogen.sh 2006/07/24 20:17:02 1.2
@@ -3,4 +3,5 @@
# TODO: implement me
+# satisfy makes' includes
cp make/defines.mk.in make/defines.mk
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] conga ./Makefile ./autogen.sh ./configure ./co ...
@ 2006-08-09 20:53 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-08-09 20:53 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-08-09 20:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-09 20:53 [Cluster-devel] conga ./Makefile ./autogen.sh ./configure ./co kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-07-24 20:17 kupcevic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.