From 7c3732a035bd65510a2a123687768670fdaea1e4 Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Mon, 11 Feb 2008 14:02:19 -0800 Subject: fixing installation of init script. --- Makefile.am | 5 +++-- configure.ac | 3 +-- debian/vyatta-wanloadbalance.postinst | 10 +--------- debian/vyatta-wanloadbalance.postinst.in | 7 ++++--- debian/vyatta-wanloadbalance.postrm | 3 +++ debian/vyatta-wanloadbalance.postrm.in | 3 +++ 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 864c0ad..5987950 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,13 @@ cfgdir = $(datadir)/vyatta-cfg/templates initddir = /etc/init.d +etcdir = /etc AM_CPPFLAGS = -I src -Wall -DDEBUG CLEANFILES = src/main.o src/lbdata.o src/lbdatafactory.o src/loadbalance.o src/rl_str_proc.o src/lbpathtest.o src/lboutput.o -sbin_SCRIPTS = scripts/vyatta-wanloadbalance.init -sbin_SCRIPTS += scripts/vyatta-wanloadbalance.pl +sbin_SCRIPTS = scripts/vyatta-wanloadbalance.pl src_wan_lb_SOURCES = src/main.cc src_wan_lb_SOURCES += src/lbdata.cc @@ -26,3 +26,4 @@ cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ install-exec-hook: mkdir -p $(DESTDIR)$(cfgdir) cd templates; $(cpiop) $(DESTDIR)$(cfgdir) + find etc ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | cpio -0pd $(DESTDIR) \ No newline at end of file diff --git a/configure.ac b/configure.ac index ab2bacf..38b00d0 100644 --- a/configure.ac +++ b/configure.ac @@ -28,8 +28,7 @@ AC_ARG_ENABLE([nostrip], AC_CONFIG_FILES( [Makefile] [debian/vyatta-wanloadbalance.postinst] - [debian/vyatta-wanloadbalance.postrm] - [scripts/vyatta-wanloadbalance.init]) + [debian/vyatta-wanloadbalance.postrm]) AC_SUBST(NOSTRIP) diff --git a/debian/vyatta-wanloadbalance.postinst b/debian/vyatta-wanloadbalance.postinst index 0595d44..0a900f6 100644 --- a/debian/vyatta-wanloadbalance.postinst +++ b/debian/vyatta-wanloadbalance.postinst @@ -9,13 +9,5 @@ sysconfdir=${prefix}/etc mkdir -p $LOADBALANCE_DIR chmod 0755 $LOADBALANCE_DIR -rm -f /etc/init.d/vyatta-wanloadbalance 2>/dev/null -ln -s /opt/vyatta/sbin/vyatta-wanloadbalance.init /etc/init.d/vyatta-wanloadbalance 2>/dev/null +update-rc.d -f vyatta-wanloadbalance defaults 2>/dev/null -#because I'm lazy and don't want to have to create an extra pkg for the show cmd -mkdir -p /opt/vyatta/share/vyatta-op/templates/show/wan-load-balance/status/ -mv /opt/vyatta/share/vyatta-cfg/templates/show/wan-load-balance/node.def /opt/vyatta/share/vyatta-op/templates/show/wan-load-balance/. -mv /opt/vyatta/share/vyatta-cfg/templates/show/wan-load-balance/status/node.def /opt/vyatta/share/vyatta-op/templates/show/wan-load-balance/status/. - - -#nothing diff --git a/debian/vyatta-wanloadbalance.postinst.in b/debian/vyatta-wanloadbalance.postinst.in index dea57dc..0a900f6 100644 --- a/debian/vyatta-wanloadbalance.postinst.in +++ b/debian/vyatta-wanloadbalance.postinst.in @@ -3,10 +3,11 @@ LOADBALANCE_DIR=/var/load-balance -prefix=@prefix@ -sysconfdir=@sysconfdir@ +prefix=/opt/vyatta +sysconfdir=${prefix}/etc mkdir -p $LOADBALANCE_DIR chmod 0755 $LOADBALANCE_DIR -#nothing +update-rc.d -f vyatta-wanloadbalance defaults 2>/dev/null + diff --git a/debian/vyatta-wanloadbalance.postrm b/debian/vyatta-wanloadbalance.postrm index 05a7907..c9bc1e8 100644 --- a/debian/vyatta-wanloadbalance.postrm +++ b/debian/vyatta-wanloadbalance.postrm @@ -1,2 +1,5 @@ #!/bin/bash +which /etc/init.d/vyatta-wanloadbalance >/dev/null && /etc/init.d/vyatta-wanloadbalance stop + +update-rc.d vyatta-wanloadbalance remove diff --git a/debian/vyatta-wanloadbalance.postrm.in b/debian/vyatta-wanloadbalance.postrm.in index 05a7907..c9bc1e8 100644 --- a/debian/vyatta-wanloadbalance.postrm.in +++ b/debian/vyatta-wanloadbalance.postrm.in @@ -1,2 +1,5 @@ #!/bin/bash +which /etc/init.d/vyatta-wanloadbalance >/dev/null && /etc/init.d/vyatta-wanloadbalance stop + +update-rc.d vyatta-wanloadbalance remove -- cgit v1.2.3 From f5997468a4aad5000cde8563ed277edbaf11d70f Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Mon, 11 Feb 2008 14:04:14 -0800 Subject: more cleanup. --- .../rule/node.tag/destination/port-name/node.def | 3 --- .../rule/node.tag/destination/port-number/node.def | 7 ----- .../wan/rule/node.tag/source/port-name/node.def | 3 --- .../wan/rule/node.tag/source/port-number/node.def | 6 ----- etc/init.d/vyatta-wanloadbalance | 31 ++++++++++++++++++++++ 5 files changed, 31 insertions(+), 19 deletions(-) delete mode 100644 debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def delete mode 100644 debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def delete mode 100644 debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def delete mode 100644 debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def create mode 100644 etc/init.d/vyatta-wanloadbalance diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def deleted file mode 100644 index fbc6446..0000000 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def +++ /dev/null @@ -1,3 +0,0 @@ -tag: -type: txt -help: Port name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def deleted file mode 100644 index 72cb512..0000000 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def +++ /dev/null @@ -1,7 +0,0 @@ -tag: -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" -help: Port number -comp_help: possible completions: -<1-65535> Port number - diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def deleted file mode 100644 index 6f8bcf5..0000000 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def +++ /dev/null @@ -1,3 +0,0 @@ -tag: -type: txt -help: port name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def deleted file mode 100644 index 599a4c6..0000000 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def +++ /dev/null @@ -1,6 +0,0 @@ -tag: -type: u32 -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" -help: port number -comp_help: possible completions: -<1-65535> Port number diff --git a/etc/init.d/vyatta-wanloadbalance b/etc/init.d/vyatta-wanloadbalance new file mode 100644 index 0000000..fb5edcc --- /dev/null +++ b/etc/init.d/vyatta-wanloadbalance @@ -0,0 +1,31 @@ +#! /bin/bash + +declare progname=${0##*/} +declare action=$1; shift + +conf=$1; shift +pid=/var/run/vyatta/wlb.pid + +test -x $bb || exit 0 + +start () +{ + /opt/vyatta/sbin/wan_lb -f $conf -d -i $pid +} + +stop () +{ + if [ -f $pid ] + then + kill -s SIGTERM $( cat $pid ) 2>/dev/null + fi +} + +case "$action" in + start) start;; + stop) stop;; + force-reload) stop; sleep 1; start;; + restart) stop; sleep 1; start;; + *) echo "Usage: $progname {start|stop|restart}" + exit 1 +esac -- cgit v1.2.3