CLEANUP: examples: remove some obsolete and confusing files

Some files are totally obsolete. The Formilux init scripts and packaging
scripts for haproxy 1.1.21 should go. Linux 2.4 kernel patch to enable
epoll() on EOLed RHEL3 should go. The tuning script is incomplete and
only suited to older kernels, better stop shipping this one.

diff --git a/examples/build.cfg b/examples/build.cfg
deleted file mode 100644 (file)
index 2dd7527..0000000
--- a/examples/build.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# build script for formilux >0.1.8
-
-PATCH_LIST=
-FILE_LIST=
-
-function do_compile_only {
-    $FLXMAKE CPU_OPTS="-march=$arch -mcpu=$cpu -Os -mpreferred-stack-boundary=2 -momit-leaf-frame-pointer -malign-jumps=0" \
-            TARGET=linux24
-}
-
-function do_prepack {
-    mkdir -p $ROOTDIR/sbin/init.d ; cp examples/init.haproxy.flx0 $ROOTDIR/sbin/init.d/haproxy
-    mkdir -p $ROOTDIR/usr/sbin ; cp haproxy $ROOTDIR/usr/sbin
-    mkdir -p $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/haproxy/
-    cp examples/haproxy.cfg $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/haproxy/haproxy.cfg
-    cp examples/rc.highsock $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/rc.highsock
-    cp examples/config.rc.haproxy $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/config.rc.haproxy
-    mkdir -p $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER
-    cp doc/haproxy.txt $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER
-    ln -s ../../examples/$PKGRADIX/$PKGRADIX-$PKGVER $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER/examples
-    cp examples/debug2ansi examples/debug2html examples/debugfind $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER/
-    set_default_perm $ROOTDIR
-}

diff --git a/examples/config.rc.haproxy b/examples/config.rc.haproxy
deleted file mode 100644 (file)
index 5340495..0000000
--- a/examples/config.rc.haproxy
+++ /dev/null
@@ -1,6 +0,0 @@
-service haproxy ext
-       config /etc/haproxy/haproxy-ext.cfg
-
-service haproxy int
-       config /etc/haproxy/haproxy-int.cfg
-

diff --git a/examples/haproxy-1.1.21-flx.1.pkg b/examples/haproxy-1.1.21-flx.1.pkg
deleted file mode 100644 (file)
index 8054ffd..0000000
--- a/examples/haproxy-1.1.21-flx.1.pkg
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-function do_compile {
-    $FLXMAKE COPTS="-march=$arch -mcpu=$cpu -Os -mpreferred-stack-boundary=2 -momit-leaf-frame-pointer -malign-jumps=0 -DNETFILTER -DTRANSPARENT"
-}
-
-function do_prepack {
-    mkdir -p $ROOTDIR/sbin/init.d ; cp init.d/haproxy $ROOTDIR/sbin/init.d
-    mkdir -p $ROOTDIR/usr/sbin ; cp haproxy $ROOTDIR/usr/sbin
-    mkdir -p $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc
-    cp examples/haproxy.cfg $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/haproxy.cfg
-    cp examples/rc.highsock $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/rc.highsock
-    cp examples/config.rc.haproxy $ROOTDIR/usr/share/examples/$PKGRADIX/$PKGRADIX-$PKGVER/etc/config.rc.haproxy
-    mkdir -p $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER
-    cp doc/haproxy.txt $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER
-    ln -s ../../examples/$PKGRADIX/$PKGRADIX-$PKGVER $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER/examples
-    cp examples/debug2ansi examples/debug2html examples/debugfind $ROOTDIR/usr/share/$PKGRADIX/$PKGRADIX-$PKGVER/
-
-    make clean
-}
-

diff --git a/examples/init.haproxy.flx0 b/examples/init.haproxy.flx0
deleted file mode 100644 (file)
index a7edd9c..0000000
--- a/examples/init.haproxy.flx0
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. `dirname $0`/functions
-
-option config          standard_option /etc/haproxy/haproxy.cfg
-option bin             reserved_option /usr/sbin/haproxy
-option cmdline         reserved_option '$bin -f ${opt_config} -p ${pidfile} -D -q'
-
-function do_help {
-    echo "Usage: ${0##*/} <status|start|stop|help|conf>"
-    echo "List of config.rc options (name, type, default value, current value) :"
-    echo
-    echo "   - config ; def=/etc/haproxy/haproxy.cfg ; cur=$opt_confdir"
-    echo
-    exit 1 
-}
-
-# reads the configuration file and checks its syntax.
-function do_conf {
-    $bin -c -V -q -f ${opt_config}
-}
-
-# assign default values to options and variables before parsing the cfg file
-function fct_begin_section {
-    pidfile="/var/run/haproxy${2:+-$2}.pid"
-}
-
-load_config
-

diff --git a/examples/linux-2.4.21-40.EL-custom.diff b/examples/linux-2.4.21-40.EL-custom.diff
deleted file mode 100644 (file)
index a96c800..0000000
--- a/examples/linux-2.4.21-40.EL-custom.diff
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -urN linux-2.4.21-40.EL/arch/i386/config.in linux-2.4.21-40.EL-epoll/arch/i386/config.in
---- linux-2.4.21-40.EL/arch/i386/config.in     2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/arch/i386/config.in       2006-03-17 09:34:42.000000000 +0100
-@@ -380,6 +380,7 @@
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
- 
- bool 'Kernel .config support' CONFIG_IKCONFIG
-+bool 'Support for epoll' CONFIG_EPOLL
- 
- tristate 'System call auditing' CONFIG_AUDIT
- 
-diff -urN linux-2.4.21-40.EL/arch/i386/kernel/entry.S linux-2.4.21-40.EL-epoll/arch/i386/kernel/entry.S
---- linux-2.4.21-40.EL/arch/i386/kernel/entry.S        2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/arch/i386/kernel/entry.S  2006-03-17 09:34:42.000000000 +0100
-@@ -816,9 +816,15 @@
-       .long SYMBOL_NAME(sys_ni_syscall)       /* sys_free_hugepages */
-       .long SYMBOL_NAME(sys_exit_group)
-       .long SYMBOL_NAME(sys_lookup_dcookie)
-+#ifdef CONFIG_EPOLL
-+      .long SYMBOL_NAME(sys_epoll_create)
-+      .long SYMBOL_NAME(sys_epoll_ctl)        /* 255 */
-+      .long SYMBOL_NAME(sys_epoll_wait)
-+#else
-       .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_create */
-       .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_ctl 255 */
-       .long SYMBOL_NAME(sys_ni_syscall)       /* sys_epoll_wait */
-+#endif /* CONFIG_EPOLL */
-       .long sys_remap_file_pages
-       .long SYMBOL_NAME(sys_set_tid_address)
-       .long SYMBOL_NAME(sys_ni_syscall)       /* sys_timer_create */
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon.config     2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon.config       2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon-smp.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-athlon-smp.config 2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-athlon-smp.config   2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i386.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i386.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i386.config       2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i386.config 2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- # CONFIG_AFS_FS is not set
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i586.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i586.config       2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586.config 2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i586-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586-smp.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i586-smp.config   2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i586-smp.config     2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686.config       2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686.config 2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-hugemem.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-hugemem.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-hugemem.config       2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-hugemem.config 2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-smp.config linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-smp.config
---- linux-2.4.21-40.EL/configs/kernel-2.4.21-i686-smp.config   2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/configs/kernel-2.4.21-i686-smp.config     2006-03-17 09:34:42.000000000 +0100
-@@ -1575,7 +1575,7 @@
- CONFIG_QUOTA=y
- # CONFIG_QFMT_V1 is not set
- CONFIG_QFMT_V2=y
--# CONFIG_EPOLL is not set
-+CONFIG_EPOLL=y
- 
- # CONFIG_QIFACE_COMPAT is not set
- CONFIG_AFS_FS=m
-diff -urN linux-2.4.21-40.EL/Makefile linux-2.4.21-40.EL-epoll/Makefile
---- linux-2.4.21-40.EL/Makefile        2006-03-17 09:34:24.000000000 +0100
-+++ linux-2.4.21-40.EL-epoll/Makefile  2006-03-17 09:34:55.000000000 +0100
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 4
- SUBLEVEL = 21
--EXTRAVERSION = -40.ELcustom
-+EXTRAVERSION = -40.EL-epoll
- 
- KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
- 

diff --git a/examples/rc.highsock b/examples/rc.highsock
deleted file mode 100644 (file)
index d85935a..0000000
--- a/examples/rc.highsock
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# set this to about 256/4M (16384 for 256M machine)
-MAXFILES=16384
-echo $MAXFILES > /proc/sys/fs/file-max
-ulimit -n $MAXFILES
-
-if [ -e /proc/sys/net/ipv4/ip_conntrack_max ]; then
-       echo 65536 > /proc/sys/net/ipv4/ip_conntrack_max
-fi
-
-if [ -e /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_fin_wait ]; then
-       # 30 seconds for fin, 15 for time wait
-       echo 3000 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_fin_wait
-       echo 1500 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_time_wait
-       echo 0 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_log_invalid_scale
-       echo 0 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_log_out_of_window
-fi
-
-echo 1024 60999 > /proc/sys/net/ipv4/ip_local_port_range
-#echo 32768 > /proc/sys/net/ipv4/ip_queue_maxlen
-echo 30 > /proc/sys/net/ipv4/tcp_fin_timeout
-echo 4096 > /proc/sys/net/ipv4/tcp_max_syn_backlog
-echo 262144 > /proc/sys/net/ipv4/tcp_max_tw_buckets
-echo 262144 > /proc/sys/net/ipv4/tcp_max_orphans
-echo 300 > /proc/sys/net/ipv4/tcp_keepalive_time
-echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle
-echo 0 > /proc/sys/net/ipv4/tcp_timestamps
-echo 0 > /proc/sys/net/ipv4/tcp_ecn
-echo 0 > /proc/sys/net/ipv4/tcp_sack
-echo 0 > /proc/sys/net/ipv4/tcp_dsack
-
-# auto-tuned on 2.4
-#echo 262143 > /proc/sys/net/core/rmem_max
-#echo 262143 > /proc/sys/net/core/rmem_default
-
-echo 16384 65536 524288 > /proc/sys/net/ipv4/tcp_rmem
-echo 16384 349520 699040 > /proc/sys/net/ipv4/tcp_wmem
-