update RA.

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10437 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/configure.in b/configure.in
index 46bf7a1..9a96adf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -114,4 +114,3 @@ AC_CONFIG_FILES([doc/Makefile]
                 [l7vsd/src/Makefile]
                 [Makefile])
 
-AC_OUTPUT(l7vsd.spec)

diff --git a/doc/heartbeat-ra/L7directord b/doc/heartbeat-ra/L7directord
index 49c0eac..4fd7edd 100644 (file)
--- a/doc/heartbeat-ra/L7directord
+++ b/doc/heartbeat-ra/L7directord
@@ -109,7 +109,7 @@ l7directord_pkill(){
 ###############################
 isRunning(){
        RET=0
-        RET=`ps -ef | grep "/usr/sbin/l7directord start" | grep -v grep | wc -l`
+        RET=`pgrep -fox "/usr/sbin/l7directord start" | wc -l`
        return $RET
 }
 
@@ -118,7 +118,7 @@ isRunning(){
 # Flush Virtual Service Method
 ###############################
 l7vsd_flush(){
-        PS=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
+        PS=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
         if [ $PS -eq 1 ]; then
                   ocf_log info "[l7vsadm]: flush virtual service!"
                   l7vsadm -C

diff --git a/doc/heartbeat-ra/L7vsd b/doc/heartbeat-ra/L7vsd
index 5a68c26..e272df7 100644 (file)
--- a/doc/heartbeat-ra/L7vsd
+++ b/doc/heartbeat-ra/L7vsd
@@ -159,7 +159,7 @@ l7vsd_pkill(){
 ###############################
 isRunning(){
        RET=0
-       RET=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
+       RET=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
        return $RET
 }
 

diff --git a/l7vsd.spec.in b/l7vsd.spec.in
deleted file mode 100644 (file)
index 967e414..0000000
--- a/l7vsd.spec.in
+++ /dev/null
@@ -1,106 +0,0 @@
-%define prefix   /usr
-
-#Uncomment these if they are not defined by your rpm macros file
-%define _sysconfdir             /etc
-%define _localstatedir          /var
-
-Summary: UltraMonkey-l7 Layer7 software load balancing server
-Name: l7vsd
-Version: 3.0.0
-Release: 0
-License: BOOST SOFTWARE LICENSE
-Packager: Norihisa NAKAI
-Group: Network
-Source0: %{name}-%{version}-%{release}.tar.gz
-BuildRoot: /var/tmp/%{name}-%{version}-root
-Docdir: %{prefix}/doc
-Provides: %{name}-%{version}-%{release}
-BuildPrereq: automake autoconf libtool
-AutoReqProv: no
-#Requires:
-
-%description
-Layer7 load balancing server daemon that works with TCP/UDP balancing
-
-%prep
-rm -rf ${RPM_BUILD_ROOT}
-%setup
-
-%build
-
-# I am providing my own configure macro replacement. Hopefully this
-# will result in fewer portability problems than using the one supplied
-# by various vendours. I fear that I hope in vein.
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-if [ -f configure.in ]; then
-       aclocal
-       libtoolize --force --copy
-       automake
-       autoconf
-fi
-./configure %{_target_platform} \
-       --prefix=%{_prefix} \
-       --exec-prefix=%{_exec_prefix} \
-       --bindir=%{_bindir} \
-       --sbindir=%{_sbindir} \
-       --sysconfdir=%{_sysconfdir} \
-       --datadir=%{_datadir} \
-       --includedir=%{_includedir} \
-       --libdir=%{_libdir} \
-       --libexecdir=%{_libexecdir} \
-       --localstatedir=%{_localstatedir} \
-       --sharedstatedir=%{_sharedstatedir} \
-       --mandir=%{_mandir} \
-       --infodir=%{_infodir}
-
-make -j2
-
-%install
-# rm -rf ${RPM_BUILD_ROOT}
-
-# Manually install init script
-#mkdir -p ${RPM_BUILD_ROOT}/etc/init.d/
-#install -c -m 755 \
-#        ${RPM_BUILD_DIR}/%{name}-%{version}/etc/init.d/sslproxy.rh \
-#               ${RPM_BUILD_ROOT}/etc/init.d/sslproxy
-
-# Install everything else
-#make DESTDIR=$RPM_BUILD_ROOT install
-
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/l7vs
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/l7vs/
-
-install -c -m 755 -D src/l7vsadm $RPM_BUILD_ROOT%{_sbindir}
-
-install -c -m 755 -D src/l7vsd $RPM_BUILD_ROOT%{_sbindir}
-
-install -c -m 755 -D init.d/sslproxy $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-
-install -c -m 644 -D conf/sslproxy.logger_init.cf $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D conf/sslproxy.target_1.cf $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D conf/sslproxy.target_2.cf $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D conf/sslproxyadm.cf $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D conf/sslproxyadm.logrotate $RPM_BUILD_ROOT%/etc/logrotate.d/sslproxy
-
-install -c -m 644 -D sslfiles/root.pem $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D sslfiles/server.pem $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D sslfiles/passwd.txt $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-install -c -m 644 -D sslfiles/dh512.pem $RPM_BUILD_ROOT%{_sysconfdir}/l7vs/sslproxy
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root, 0755)
-%{_sbindir}
-%config %{_sysconfdir}/init.d/*
-%config %{_sysconfdir}/l7vs/sslproxy/*
-
-#%doc README COPYING
-#%{_mandir}
-
-%changelog
-

diff --git a/ultramonkeyl7.spec b/ultramonkeyl7.spec
index 2db01a8..e9bd5bc 100644 (file)
--- a/ultramonkeyl7.spec
+++ b/ultramonkeyl7.spec
@@ -9,13 +9,14 @@ Version: 3.0.0
 Release: 1
 License: LGPLv2
 Group: System Environment/Daemons
-URL: http://ultramonkey-l7.sourceforge.jp/
+URL: http://sourceforge.jp/projects/ultramonkey-l7/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel
 AutoReqProv: no
 
 %define hb2_tempdir    /usr/share/doc/%{name}-%{version}-%{release}/heartbeat-ra
+%define mibs_tempdir   /usr/share/doc/%{name}-%{version}-%{release}/mibs
 
 %description
 Layer-7 load balancing daemon
@@ -39,6 +40,7 @@ mkdir -p -m 755 ${RPM_BUILD_ROOT}%{l7vs_moddir}
 mkdir -p ${RPM_BUILD_ROOT}%{l7vs_logdir}
 mkdir -p ${RPM_BUILD_ROOT}%{l7vsadm_sockdir}
 mkdir -p ${RPM_BUILD_ROOT}%{hb2_tempdir}
+mkdir -p ${RPM_BUILD_ROOT}%{mibs_tempdir}
 
 # bin
 install -c -m 755 -D l7vsd/src/l7vsd ${RPM_BUILD_ROOT}%{_sbindir}/l7vsd
@@ -75,6 +77,9 @@ install -c -m 755 -D doc/heartbeat-ra/L7vsd ${RPM_BUILD_ROOT}%{hb2_tempdir}/L7vs
 install -c -m 755 -D doc/heartbeat-ra/L7directord ${RPM_BUILD_ROOT}%{hb2_tempdir}/L7directord
 install -c -m 755 -D doc/heartbeat-ra/VIPcheck ${RPM_BUILD_ROOT}%{hb2_tempdir}/VIPcheck
 
+# mib file
+install -c -m 644 -D doc/mibs/ULTRAMONKEY-L7-MIB.txt ${RPM_BUILD_ROOT}%{mibs_tempdir}/ULTRAMONKEY-L7-MIB.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT