Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 652

Timestamp:

06/16/07 01:09:45 (1 year ago)

Author:

raphael

Message:

Removed ispcp-mkdirs.pl
Now engine/tools/ispcpphptemp.sh uses per-domain php.ini (4 and 5) settings
Makefile now checks for ENV var INST_PREF and use it instead of default
Added detection of lenny/sid and not just etch
Fixed #390: Extra character in fedora's languages.sql
Rewritten init.d/ispcp_network
Removed extra empty new line at the top of reseller/domain_statistics.php

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/Makefile (modified) (3 diffs)
trunk/Makefile.fedora (modified) (1 diff)
trunk/Makefile.inc (modified) (1 diff)
trunk/Makefile.sles9 (modified) (1 diff)
trunk/Makefile.suse100 (modified) (1 diff)
trunk/Makefile.suse93 (modified) (1 diff)
trunk/Makefile.ubuntu (modified) (1 diff)
trunk/configs/Makefile (modified) (2 diffs)
trunk/configs/apache/Makefile (modified) (2 diffs)
trunk/configs/dists/fedora/database/languages.sql (modified) (1 diff)
trunk/configs/dists/fedora/init.d/ispcp_daemon (modified) (1 diff)
trunk/configs/dists/fedora/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/gentoo/init.d/ispcp_daemon (modified) (2 diffs)
trunk/configs/dists/gentoo/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/redhat/init.d/ispcp_daemon (modified) (2 diffs)
trunk/configs/dists/redhat/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/sles9/init.d/ispcp_daemon (modified) (1 diff)
trunk/configs/dists/sles9/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/suse100/init.d/ispcp_daemon (modified) (1 diff)
trunk/configs/dists/suse100/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/suse93/init.d/ispcp_daemon (modified) (1 diff)
trunk/configs/dists/suse93/init.d/ispcp_network (modified) (1 diff)
trunk/configs/dists/ubuntu/init.d/ispcp_daemon (modified) (2 diffs)
trunk/configs/dists/ubuntu/init.d/ispcp_network (modified) (1 diff)
trunk/configs/init.d/ispcp_daemon (modified) (2 diffs)
trunk/configs/init.d/ispcp_network (modified) (1 diff)
trunk/configs/proftpd/Makefile (modified) (1 diff)
trunk/engine/tools/ispcpphptemp.sh (modified) (1 diff)
trunk/engine/traffic/ispcp-srv-traff (modified) (2 diffs)
trunk/gui/reseller/domain_statistics.php (modified) (1 diff)
trunk/tools/BSDmakefile (modified) (2 diffs)
trunk/tools/Makefile (modified) (2 diffs)
trunk/tools/build (deleted)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r651	r652
10	10	\| * gui: disable stats-alias in client menu \|
11	11	\_________________________________________________________________/
	12
	13	2007-06-15 Raphael Geissert
	14	- TOOLS:
	15	* Removed ispcp-mkdirs.pl
	16	- ENGINE:
	17	* Now engine/tools/ispcpphptemp.sh uses per-domain php.ini (4 and 5) settings
	18	- CONFIGS:
	19	* Makefile now checks for ENV var INST_PREF and use it instead of default
	20	* Added detection of lenny/sid and not just etch
	21	* Fixed #390: Extra character in fedora's languages.sql
	22	* Rewritten init.d/ispcp_network by adding start\|stop\|restart\|force-restart targets,
	23	configurable via /etc/default/ispcp_network and added patch from #257
	24	- GUI:
	25	* Removed extra empty new line at the top of reseller/domain_statistics.php
12	26
13	27	2007-06-13 Benedikt Heintel

trunk/Makefile

r625	r652
	1	#!/usr/bin/make -f
1	2
2		INST_PREF=/tmp/ispcp-1.0.0
	3	INST_PREF=$(shell \
	4	if [ $INST_PREF ]; then \
	5	echo $INST_PREF; \
	6	else \
	7	echo "/tmp/ispcp-1.0.0"; \
	8	fi; \
	9	)
3	10
4	11	HOST_OS=debian
…	…
22	29	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	30
24		SYSTEM_MAKE_DIRS=/usr/sbin/ispcp-mkdirs.pl
25
26		CODE_PHP=/usr/sbin/encode-file
	31	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
27	32
28	33	export
…	…
62	67	rm -rf $(SYSTEM_MAIL_VIRTUAL)
63	68	rm -rf $(SYSTEM_APACHE_BACK_LOG)
64		rm -rf ./*~
	69	#rm -rf ./*~
	70
	71	.PHONY: install uninstall

trunk/Makefile.fedora

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/Makefile.inc

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/Makefile.sles9

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/Makefile.suse100

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/Makefile.suse93

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/Makefile.ubuntu

r625	r652
22	22	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
23	23
24		SYSTEM_MAKE_DIRS=~~/usr/sbin/ispcp-mkdirs.pl~~
	24	SYSTEM_MAKE_DIRS="/usr/bin/make -p"
25	25
26	26	CODE_PHP=/usr/sbin/encode-file

trunk/configs/Makefile

r473	r652
4	4	install:
5	5
6		if [~~[ $(HOST_OS) == debian ]~~] ; then \
	6	if [ $(HOST_OS) == debian ] ; then \
7	7	cp ./ispcp.conf $(SYSTEM_CONF) ; \
8		~~cd ./apache && $(MAKE) install ; cd ..~~ ; \
9		~~cd ./awstats && $(MAKE) install ; cd ..~~ ; \
10		~~cd ./bind && $(MAKE) install ; cd ..~~ ; \
11		~~cd ./crontab && $(MAKE) install ; cd ..~~ ; \
12		~~cd ./cron.d && $(MAKE) install ; cd ..~~ ; \
13		~~cd ./database && $(MAKE) install ; cd ..~~ ; \
14		~~cd ./fcgi && $(MAKE) install ; cd ..~~ ; \
15		~~cd ./init.d && $(MAKE) install ; cd ..~~ ; \
16		~~cd ./postfix && $(MAKE) install ; cd ..~~ ; \
17		~~cd ./courier && $(MAKE) install ; cd ..~~ ; \
18		~~cd ./proftpd && $(MAKE) install ; cd ..~~ ; \
19		~~cd ./logrotate && $(MAKE) install ; cd ..~~ ; \
20		elif [~~[ $(HOST_OS) == fedora ]~~] ; then \
	8	(cd ./apache && $(MAKE) install); \
	9	(cd ./awstats && $(MAKE) install); \
	10	(cd ./bind && $(MAKE) install); \
	11	(cd ./crontab && $(MAKE) install); \
	12	(cd ./cron.d && $(MAKE) install); \
	13	(cd ./database && $(MAKE) install); \
	14	(cd ./fcgi && $(MAKE) install); \
	15	(cd ./init.d && $(MAKE) install); \
	16	(cd ./postfix && $(MAKE) install); \
	17	(cd ./courier && $(MAKE) install); \
	18	(cd ./proftpd && $(MAKE) install); \
	19	(cd ./logrotate && $(MAKE) install); \
	20	elif [ $(HOST_OS) == fedora ] ; then \
21	21	cd ./dists/fedora && $(MAKE) install ; \
22		elif [~~[ $(HOST_OS) == gentoo ]~~] ; then \
	22	elif [ $(HOST_OS) == gentoo ] ; then \
23	23	cd ./dists/gentoo && $(MAKE) install ; \
24		elif [~~[ $(HOST_OS) == redhat ]~~] ; then \
	24	elif [ $(HOST_OS) == redhat ] ; then \
25	25	cd ./dists/redhat && $(MAKE) install ; \
26		elif [~~[ $(HOST_OS) == sles9 ]~~] ; then \
	26	elif [ $(HOST_OS) == sles9 ] ; then \
27	27	cd ./dists/sles9 && $(MAKE) install ; \
28		elif [~~[ $(HOST_OS) == suse100 ]~~] ; then \
	28	elif [ $(HOST_OS) == suse100 ] ; then \
29	29	cd ./dists/suse100 && $(MAKE) install ; \
30		elif [~~[ $(HOST_OS) == suse93 ]~~] ; then \
	30	elif [ $(HOST_OS) == suse93 ] ; then \
31	31	cd ./dists/suse93 && $(MAKE) install ; \
32		elif [~~[ $(HOST_OS) == ubuntu ]~~] ; then \
	32	elif [ $(HOST_OS) == ubuntu ] ; then \
33	33	cd ./dists/ubuntu && $(MAKE) install ; \
34	34	fi
…	…
36	36	uninstall:
37	37
38		if [~~[ $(HOST_OS) == debian ]~~] ; then \
	38	if [ $(HOST_OS) == debian ] ; then \
39	39	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
40		~~cd ./apache && $(MAKE) uninstall ; cd ..~~ ; \
41		~~cd ./awstats && $(MAKE) uninstall ; cd ..~~ ; \
42		~~cd ./bind && $(MAKE) uninstall ; cd ..~~ ; \
43		~~cd ./crontab && $(MAKE) uninstall ; cd ..~~ ; \
44		~~cd ./cron.d && $(MAKE) uninstall ; cd ..~~ ; \
45		~~cd ./database && $(MAKE) uninstall ; cd .. ;~~ \
46		~~cd ./init.d && $(MAKE) uninstall ; cd ..~~ ; \
47		~~cd ./postfix && $(MAKE) uninstall ; cd ..~~ ; \
48		~~cd ./courier && $(MAKE) uninstall ; cd ..~~ ; \
49		~~cd ./proftpd && $(MAKE) uninstall ; cd ..~~ ; \
50		~~cd ./logrotate && $(MAKE) uninstall ; cd ..~~ ; \
51		elif [~~[ $(HOST_OS) == fedora ]~~] ; then \
	40	(cd ./apache && $(MAKE) uninstall); \
	41	(cd ./awstats && $(MAKE) uninstall); \
	42	(cd ./bind && $(MAKE) uninstall); \
	43	(cd ./crontab && $(MAKE) uninstall); \
	44	(cd ./cron.d && $(MAKE) uninstall); \
	45	(cd ./database && $(MAKE) uninstall); \
	46	(cd ./init.d && $(MAKE) uninstall); \
	47	(cd ./postfix && $(MAKE) uninstall); \
	48	(cd ./courier && $(MAKE) uninstall); \
	49	(cd ./proftpd && $(MAKE) uninstall); \
	50	(cd ./logrotate && $(MAKE) uninstall); \
	51	elif [ $(HOST_OS) == fedora ] ; then \
52	52	cd ./dists/fedora && $(MAKE) uninstall ; \
53		elif [~~[ $(HOST_OS) == gentoo ]~~] ; then \
	53	elif [ $(HOST_OS) == gentoo ] ; then \
54	54	cd ./dists/gentoo && $(MAKE) uninstall ; \
55		elif [~~[ $(HOST_OS) == redhat ]~~] ; then \
	55	elif [ $(HOST_OS) == redhat ] ; then \
56	56	cd ./dists/redhat && $(MAKE) uninstall ; \
57		elif [~~[ $(HOST_OS) == sles9 ]~~] ; then \
	57	elif [ $(HOST_OS) == sles9 ] ; then \
58	58	cd ./dists/sles9 && $(MAKE) uninstall ; \
59		elif [~~[ $(HOST_OS) == suse93 ]~~] ; then \
	59	elif [ $(HOST_OS) == suse93 ] ; then \
60	60	cd ./dists/suse93 && $(MAKE) uninstall ; \
61		elif [~~[ $(HOST_OS) == suse100 ]~~] ; then \
	61	elif [ $(HOST_OS) == suse100 ] ; then \
62	62	cd ./dists/suse100 && $(MAKE) uninstall ; \
63		elif [~~[ $(HOST_OS) == ubuntu ]~~] ; then \
	63	elif [ $(HOST_OS) == ubuntu ] ; then \
64	64	cd ./dists/ubuntu && $(MAKE) uninstall ; \
65	65	fi

trunk/configs/apache/Makefile

r509	r652
15	15
16	16	# Debian 4.0 "Etch"?
17		if [~~[ $(RELEASE) == '4.0' ]]~~ ; then \
	17	if [ $(RELEASE) == '4.0' ] \|\| [ $(RELEASE) == 'lenny/sid' ]; then \
18	18	cp ./fastcgi2.conf ./working/fastcgi.conf ; \
19	19	else \
20	20	cp ./fastcgi.conf ./working/fastcgi.conf ; \
21		fi \
	21	fi
22	22
23	23	cp ./httpd.conf $(SYSTEM_CONF)/apache
…	…
27	27	cp -R ./working $(SYSTEM_CONF)/apache
28	28
29		cp -R ./fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf
	29	cp -R ./working/fastcgi.conf ${ROOT_APACHE_CONF}/mods-available/fastcgi.conf
30	30
31	31	uninstall:

trunk/configs/dists/fedora/database/languages.sql

r617	r652
1132	1132	(1103, 'Your request for hosting pack update was removed successfully', ''),
1133	1133	(1104, 'Zip / Postal code', ''),
1134		(1105, 'Zip/Postal code', '');s
	1134	(1105, 'Zip/Postal code', '');

trunk/configs/dists/fedora/init.d/ispcp_daemon

r473 r652

57 57 start)
58 58 start
59 ~~/etc/init.d/ispcp_network~~
60 59 ;;
61 60 stop)

trunk/configs/dists/fedora/init.d/ispcp_network

r473	r652
1		#!/bin/bash
	1	#!/bin/sh
2	2
3		#
4		# Traffic chains.
5		#
	3	set -e
6	4
7		RMMOD='/sbin/rmmod'
	5	PATH=/sbin:/bin:/usr/sbin:/usr/bin
	6	DESC="ispCP Network Traffic Logger"
	7	NAME=ispcp_network
8	8
9		IPTABLES="/sbin/iptables"
	9	IPTABLES=/sbin/iptables
	10	LOGDIR=/var/log/ispcp
10	11
11		${RMMOD} ipchains 1>/tmp/ispcp_network.log 2>/tmp/ispcp_network.err.log
	12	START=1
12	13
13		#
14		# firewall commet; if u have some kind of firewall
15		# then this hurts...
16		#
17		# must be chnaged in future releases!
18		# 1zo
19		#
20		# ${IPTABLES} -F INPUT
21		# ${IPTABLES} -F OUTPUT
22		# ${IPTABLES} -F FORWARD
23		#
	14	# Read config file if it is present.
	15	if [ -r /etc/default/$NAME ]; then
	16	. /etc/default/$NAME
	17	fi
24	18
25		# all traffic
	19	if [ START -eq 0 ]; then
	20	echo "$DESC: not starting, edit /etc/default/$NAME."
	21	exit 0
	22	fi
26	23
27		${IPTABLES} -I INPUT
	24	add_rules()
	25	{
	26	${IPTABLES} -N ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	27	${IPTABLES} -N ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	28
	29	# All traffic should jump through ISPCP tables before anything else
	30	${IPTABLES} -I INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	31	${IPTABLES} -I OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	32
	33	# web traffic
	34
	35	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	36	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	37
	38	# pop3 traffic
	39
	40	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	41	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	42
	43	# imap traffic
	44
	45	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	46	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	47
	48	# mail traffic
	49
	50	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 25 2>> "${LOGDIR}/ispcp_network.err.log"
	51	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 25 2>> "${LOGDIR}/ispcp_network.err.log"
28	52
29		${IPTABLES} -I OUTPUT
	53	# Explicit return once done
	54	${IPTABLES} -A ISPCP_INPUT -j RETURN
	55	${IPTABLES} -A ISPCP_OUTPUT -j RETURN
	56	}
30	57
31		# web traffic
	58	remove_rules()
	59	{
	60	${IPTABLES} -D INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	61	${IPTABLES} -D OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	62	${IPTABLES} -F ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	63	${IPTABLES} -F ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	64	${IPTABLES} -X ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	65	${IPTABLES} -X ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	66	}
32	67
33		${IPTABLES} -I INPUT -p tcp --dport 80
34		${IPTABLES} -I OUTPUT -p tcp --sport 80
	68	case "$1" in
	69	start)
	70	echo -n "Starting $DESC:"
	71	add_rules
	72	echo " $NAME."
	73	;;
	74	stop)
	75	echo -n "Stopping $DESC:"
	76	remove_rules
	77	echo " $NAME."
	78	;;
	79	restart\|force-reload)
	80	echo -n "Restarting $DESC:"
	81	remove_rules
	82	sleep 2
	83	add_rules
	84	echo " $NAME."
	85	;;
	86	*)
	87	echo "Usage: /etc/init.d/$NAME {start\|stop\|restart\|force-reload}" >&2
	88	exit 1
	89	;;
	90	esac
35	91
36		# pop3 traffic
	92	exit 0
37	93
38		~~${IPTABLES} -I INPUT -p tcp --dport 110~~
39		~~${IPTABLES} -I OUTPUT -p tcp --sport 110~~
40
41		~~# imap traffic~~
42
43		~~${IPTABLES} -I INPUT -p tcp --dport 143~~
44		~~${IPTABLES} -I OUTPUT -p tcp --sport 143~~
45
46		~~# mail traffic~~
47
48		~~${IPTABLES} -I INPUT -p tcp --dport 25~~
49		~~${IPTABLES} -I OUTPUT -p tcp --sport 25~~
50

trunk/configs/dists/gentoo/init.d/ispcp_daemon

r473	r652
29	29	echo -n "Starting $DESC: "
30	30	start-stop-daemon --start --verbose --exec $DAEMON -- -p $PID
31		~~/etc/init.d/ispcp_network~~
32	31	echo "$NAME."
33	32	;;
…	…
43	42	rm $PID
44	43	start-stop-daemon --start --verbose --exec $DAEMON -- -p $PID
45		~~/etc/init.d/ispcp_network~~
46	44	echo "$NAME."
47	45	;;

trunk/configs/dists/gentoo/init.d/ispcp_network

r473	r652
1		#!/bin/bash
	1	#!/bin/sh
2	2
3		#
4		# Traffic chains.
5		#
	3	set -e
6	4
7		RMMOD='/sbin/rmmod'
	5	PATH=/sbin:/bin:/usr/sbin:/usr/bin
	6	DESC="ispCP Network Traffic Logger"
	7	NAME=ispcp_network
8	8
9		IPTABLES="/sbin/iptables"
	9	IPTABLES=/sbin/iptables
	10	LOGDIR=/var/log/ispcp
10	11
11		${RMMOD} ipchains 1>/tmp/ispcp_network.log 2>/tmp/ispcp_network.err.log
	12	START=1
12	13
13		#
14		# firewall commet; if u have some kind of firewall
15		# then this hurts...
16		#
17		# must be chnaged in future releases!
18		# 1zo
19		#
20		# ${IPTABLES} -F INPUT
21		# ${IPTABLES} -F OUTPUT
22		# ${IPTABLES} -F FORWARD
23		#
	14	# Read config file if it is present.
	15	if [ -r /etc/default/$NAME ]; then
	16	. /etc/default/$NAME
	17	fi
24	18
25		# all traffic
	19	if [ START -eq 0 ]; then
	20	echo "$DESC: not starting, edit /etc/default/$NAME."
	21	exit 0
	22	fi
26	23
27		${IPTABLES} -I INPUT
	24	add_rules()
	25	{
	26	${IPTABLES} -N ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	27	${IPTABLES} -N ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	28
	29	# All traffic should jump through ISPCP tables before anything else
	30	${IPTABLES} -I INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	31	${IPTABLES} -I OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	32
	33	# web traffic
	34
	35	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	36	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	37
	38	# pop3 traffic
	39
	40	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	41	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	42
	43	# imap traffic
	44
	45	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	46	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	47
	48	# mail traffic
	49
	50	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 25 2>> "${LOGDIR}/ispcp_network.err.log"
	51	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 25 2>> "${LOGDIR}/ispcp_network.err.log"
28	52
29		${IPTABLES} -I OUTPUT
	53	# Explicit return once done
	54	${IPTABLES} -A ISPCP_INPUT -j RETURN
	55	${IPTABLES} -A ISPCP_OUTPUT -j RETURN
	56	}
30	57
31		# web traffic
	58	remove_rules()
	59	{
	60	${IPTABLES} -D INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	61	${IPTABLES} -D OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	62	${IPTABLES} -F ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	63	${IPTABLES} -F ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	64	${IPTABLES} -X ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	65	${IPTABLES} -X ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	66	}
32	67
33		${IPTABLES} -I INPUT -p tcp --dport 80
34		${IPTABLES} -I OUTPUT -p tcp --sport 80
	68	case "$1" in
	69	start)
	70	echo -n "Starting $DESC:"
	71	add_rules
	72	echo " $NAME."
	73	;;
	74	stop)
	75	echo -n "Stopping $DESC:"
	76	remove_rules
	77	echo " $NAME."
	78	;;
	79	restart\|force-reload)
	80	echo -n "Restarting $DESC:"
	81	remove_rules
	82	sleep 2
	83	add_rules
	84	echo " $NAME."
	85	;;
	86	*)
	87	echo "Usage: /etc/init.d/$NAME {start\|stop\|restart\|force-reload}" >&2
	88	exit 1
	89	;;
	90	esac
35	91
36		# pop3 traffic
	92	exit 0
37	93
38		~~${IPTABLES} -I INPUT -p tcp --dport 110~~
39		~~${IPTABLES} -I OUTPUT -p tcp --sport 110~~
40
41		~~# imap traffic~~
42
43		~~${IPTABLES} -I INPUT -p tcp --dport 143~~
44		~~${IPTABLES} -I OUTPUT -p tcp --sport 143~~
45
46		~~# mail traffic~~
47
48		~~${IPTABLES} -I INPUT -p tcp --dport 25~~
49		~~${IPTABLES} -I OUTPUT -p tcp --sport 25~~
50

trunk/configs/dists/redhat/init.d/ispcp_daemon

r473	r652
29	29	echo -n "Starting $DESC: "
30	30	start-stop-daemon --start --verbose --exec $DAEMON -- -p $PID
31		~~/etc/init.d/ispcp_network~~
32	31	echo "$NAME."
33	32	;;
…	…
43	42	rm $PID
44	43	start-stop-daemon --start --verbose --exec $DAEMON -- -p $PID
45		~~/etc/init.d/ispcp_network~~
46	44	echo "$NAME."
47	45	;;

trunk/configs/dists/redhat/init.d/ispcp_network

r473	r652
1		#!/bin/bash
	1	#!/bin/sh
2	2
3		#
4		# Traffic chains.
5		#
	3	set -e
6	4
7		RMMOD='/sbin/rmmod'
	5	PATH=/sbin:/bin:/usr/sbin:/usr/bin
	6	DESC="ispCP Network Traffic Logger"
	7	NAME=ispcp_network
8	8
9		IPTABLES="/sbin/iptables"
	9	IPTABLES=/sbin/iptables
	10	LOGDIR=/var/log/ispcp
10	11
11		${RMMOD} ipchains 1>/tmp/ispcp_network.log 2>/tmp/ispcp_network.err.log
	12	START=1
12	13
13		#
14		# firewall commet; if u have some kind of firewall
15		# then this hurts...
16		#
17		# must be chnaged in future releases!
18		# 1zo
19		#
20		# ${IPTABLES} -F INPUT
21		# ${IPTABLES} -F OUTPUT
22		# ${IPTABLES} -F FORWARD
23		#
	14	# Read config file if it is present.
	15	if [ -r /etc/default/$NAME ]; then
	16	. /etc/default/$NAME
	17	fi
24	18
25		# all traffic
	19	if [ START -eq 0 ]; then
	20	echo "$DESC: not starting, edit /etc/default/$NAME."
	21	exit 0
	22	fi
26	23
27		${IPTABLES} -I INPUT
	24	add_rules()
	25	{
	26	${IPTABLES} -N ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	27	${IPTABLES} -N ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	28
	29	# All traffic should jump through ISPCP tables before anything else
	30	${IPTABLES} -I INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	31	${IPTABLES} -I OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	32
	33	# web traffic
	34
	35	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	36	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	37
	38	# pop3 traffic
	39
	40	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	41	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	42
	43	# imap traffic
	44
	45	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	46	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	47
	48	# mail traffic
	49
	50	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 25 2>> "${LOGDIR}/ispcp_network.err.log"
	51	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 25 2>> "${LOGDIR}/ispcp_network.err.log"
28	52
29		${IPTABLES} -I OUTPUT
	53	# Explicit return once done
	54	${IPTABLES} -A ISPCP_INPUT -j RETURN
	55	${IPTABLES} -A ISPCP_OUTPUT -j RETURN
	56	}
30	57
31		# web traffic
	58	remove_rules()
	59	{
	60	${IPTABLES} -D INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	61	${IPTABLES} -D OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	62	${IPTABLES} -F ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	63	${IPTABLES} -F ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	64	${IPTABLES} -X ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	65	${IPTABLES} -X ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	66	}
32	67
33		${IPTABLES} -I INPUT -p tcp --dport 80
34		${IPTABLES} -I OUTPUT -p tcp --sport 80
	68	case "$1" in
	69	start)
	70	echo -n "Starting $DESC:"
	71	add_rules
	72	echo " $NAME."
	73	;;
	74	stop)
	75	echo -n "Stopping $DESC:"
	76	remove_rules
	77	echo " $NAME."
	78	;;
	79	restart\|force-reload)
	80	echo -n "Restarting $DESC:"
	81	remove_rules
	82	sleep 2
	83	add_rules
	84	echo " $NAME."
	85	;;
	86	*)
	87	echo "Usage: /etc/init.d/$NAME {start\|stop\|restart\|force-reload}" >&2
	88	exit 1
	89	;;
	90	esac
35	91
36		# pop3 traffic
	92	exit 0
37	93
38		~~${IPTABLES} -I INPUT -p tcp --dport 110~~
39		~~${IPTABLES} -I OUTPUT -p tcp --sport 110~~
40
41		~~# imap traffic~~
42
43		~~${IPTABLES} -I INPUT -p tcp --dport 143~~
44		~~${IPTABLES} -I OUTPUT -p tcp --sport 143~~
45
46		~~# mail traffic~~
47
48		~~${IPTABLES} -I INPUT -p tcp --dport 25~~
49		~~${IPTABLES} -I OUTPUT -p tcp --sport 25~~
50

trunk/configs/dists/sles9/init.d/ispcp_daemon

r473	r652
49	49	startproc -f $DAEMON -p $PID
50	50	rc_status -v
51		~~/etc/init.d/ispcp_network~~
52	51	;;
53	52	stop)

trunk/configs/dists/sles9/init.d/ispcp_network

r473	r652
1		#!/bin/bash
	1	#!/bin/sh
2	2
3		#
4		# Traffic chains.
5		#
	3	set -e
6	4
7		RMMOD='/sbin/rmmod'
	5	PATH=/sbin:/bin:/usr/sbin:/usr/bin
	6	DESC="ispCP Network Traffic Logger"
	7	NAME=ispcp_network
8	8
9		IPTABLES="/usr/sbin/iptables"
	9	IPTABLES=/sbin/iptables
	10	LOGDIR=/var/log/ispcp
10	11
11		${RMMOD} ipchains 1>/tmp/ispcp_network.log 2>/tmp/ispcp_network.err.log
	12	START=1
12	13
13		#
14		# firewall commet; if u have some kind of firewall
15		# then this hurts...
16		#
17		# must be chnaged in future releases!
18		# 1zo
19		#
20		# ${IPTABLES} -F INPUT
21		# ${IPTABLES} -F OUTPUT
22		# ${IPTABLES} -F FORWARD
23		#
	14	# Read config file if it is present.
	15	if [ -r /etc/default/$NAME ]; then
	16	. /etc/default/$NAME
	17	fi
24	18
25		# all traffic
	19	if [ START -eq 0 ]; then
	20	echo "$DESC: not starting, edit /etc/default/$NAME."
	21	exit 0
	22	fi
26	23
27		${IPTABLES} -I INPUT
	24	add_rules()
	25	{
	26	${IPTABLES} -N ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	27	${IPTABLES} -N ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	28
	29	# All traffic should jump through ISPCP tables before anything else
	30	${IPTABLES} -I INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	31	${IPTABLES} -I OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	32
	33	# web traffic
	34
	35	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	36	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	37
	38	# pop3 traffic
	39
	40	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	41	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	42
	43	# imap traffic
	44
	45	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	46	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	47
	48	# mail traffic
	49
	50	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 25 2>> "${LOGDIR}/ispcp_network.err.log"
	51	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 25 2>> "${LOGDIR}/ispcp_network.err.log"
28	52
29		${IPTABLES} -I OUTPUT
	53	# Explicit return once done
	54	${IPTABLES} -A ISPCP_INPUT -j RETURN
	55	${IPTABLES} -A ISPCP_OUTPUT -j RETURN
	56	}
30	57
31		# web traffic
	58	remove_rules()
	59	{
	60	${IPTABLES} -D INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	61	${IPTABLES} -D OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	62	${IPTABLES} -F ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	63	${IPTABLES} -F ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	64	${IPTABLES} -X ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	65	${IPTABLES} -X ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	66	}
32	67
33		${IPTABLES} -I INPUT -p tcp --dport 80
34		${IPTABLES} -I OUTPUT -p tcp --sport 80
	68	case "$1" in
	69	start)
	70	echo -n "Starting $DESC:"
	71	add_rules
	72	echo " $NAME."
	73	;;
	74	stop)
	75	echo -n "Stopping $DESC:"
	76	remove_rules
	77	echo " $NAME."
	78	;;
	79	restart\|force-reload)
	80	echo -n "Restarting $DESC:"
	81	remove_rules
	82	sleep 2
	83	add_rules
	84	echo " $NAME."
	85	;;
	86	*)
	87	echo "Usage: /etc/init.d/$NAME {start\|stop\|restart\|force-reload}" >&2
	88	exit 1
	89	;;
	90	esac
35	91
36		# pop3 traffic
	92	exit 0
37	93
38		~~${IPTABLES} -I INPUT -p tcp --dport 110~~
39		~~${IPTABLES} -I OUTPUT -p tcp --sport 110~~
40
41		~~# imap traffic~~
42
43		~~${IPTABLES} -I INPUT -p tcp --dport 143~~
44		~~${IPTABLES} -I OUTPUT -p tcp --sport 143~~
45
46		~~# mail traffic~~
47
48		~~${IPTABLES} -I INPUT -p tcp --dport 25~~
49		~~${IPTABLES} -I OUTPUT -p tcp --sport 25~~
50

trunk/configs/dists/suse100/init.d/ispcp_daemon

r473	r652
49	49	startproc -f $DAEMON -p $PID
50	50	rc_status -v
51		~~/etc/init.d/ispcp_network~~
52	51	;;
53	52	stop)

trunk/configs/dists/suse100/init.d/ispcp_network

r473	r652
1		#!/bin/bash
	1	#!/bin/sh
2	2
3		#
4		# Traffic chains.
5		#
	3	set -e
6	4
7		RMMOD='/sbin/rmmod'
	5	PATH=/sbin:/bin:/usr/sbin:/usr/bin
	6	DESC="ispCP Network Traffic Logger"
	7	NAME=ispcp_network
8	8
9		IPTABLES="/usr/sbin/iptables"
	9	IPTABLES=/sbin/iptables
	10	LOGDIR=/var/log/ispcp
10	11
11		${RMMOD} ipchains 1>/tmp/ispcp_network.log 2>/tmp/ispcp_network.err.log
	12	START=1
12	13
13		#
14		# firewall commet; if u have some kind of firewall
15		# then this hurts...
16		#
17		# must be chnaged in future releases!
18		# 1zo
19		#
20		# ${IPTABLES} -F INPUT
21		# ${IPTABLES} -F OUTPUT
22		# ${IPTABLES} -F FORWARD
23		#
	14	# Read config file if it is present.
	15	if [ -r /etc/default/$NAME ]; then
	16	. /etc/default/$NAME
	17	fi
24	18
25		# all traffic
	19	if [ START -eq 0 ]; then
	20	echo "$DESC: not starting, edit /etc/default/$NAME."
	21	exit 0
	22	fi
26	23
27		${IPTABLES} -I INPUT
	24	add_rules()
	25	{
	26	${IPTABLES} -N ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	27	${IPTABLES} -N ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	28
	29	# All traffic should jump through ISPCP tables before anything else
	30	${IPTABLES} -I INPUT -j ISPCP_INPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	31	${IPTABLES} -I OUTPUT -j ISPCP_OUTPUT 2>> "${LOGDIR}/ispcp_network.err.log"
	32
	33	# web traffic
	34
	35	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	36	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 80 2>> "${LOGDIR}/ispcp_network.err.log"
	37
	38	# pop3 traffic
	39
	40	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	41	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 110 2>> "${LOGDIR}/ispcp_network.err.log"
	42
	43	# imap traffic
	44
	45	${IPTABLES} -I ISPCP_INPUT -p tcp --dport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	46	${IPTABLES} -I ISPCP_OUTPUT -p tcp --sport 143 2>> "${LOGDIR}/ispcp_network.err.log"
	47