summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-01 19:40:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-01 19:40:13 +0100
commiteb10ac0e97c1e5e98ce73a1966c97a7cedb9d086 (patch)
treef25892b4f15ef322487a2b00d674c255d148539c
parentb3a54c520195f3cab1109cb90de8179e4dff433f (diff)
use pkill for startup scripts
- seems to solve the issue, that the same init script get killed otherwise - fine tune dansguardian, squid and iptables package - add default firewall config file (from freewrt) - add an example for transparent proxy via an ethernet bridge
-rw-r--r--TODO4
-rw-r--r--package/axtls/files/axhttpd.init2
-rw-r--r--package/bind/files/named.init2
-rw-r--r--package/bitlbee/files/bitlbee.init2
-rw-r--r--package/bluez/files/bluez.init2
-rw-r--r--package/busybox/files/inetd.init2
-rw-r--r--package/busybox/files/syslog.init4
-rw-r--r--package/chillispot/files/chillispot.init2
-rw-r--r--package/collectd/files/collectd.init2
-rw-r--r--package/cups/files/cupsd.init2
-rw-r--r--package/dansguardian/files/dansguardian.init6
-rw-r--r--package/dbus/files/dbus.init2
-rw-r--r--package/dhcp-forwarder/files/dhcp-fwd.init2
-rw-r--r--package/dhcp/files/dhcpd.init2
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
-rw-r--r--package/dropbear/files/dropbear.init2
-rw-r--r--package/esound/files/esd.init2
-rw-r--r--package/ez-ipupdate/files/ez-ipupdate.init2
-rw-r--r--package/fakeidentd/files/fakeidentd.init2
-rw-r--r--package/freeradius-server/files/radiusd.init2
-rw-r--r--package/frickin/files/frickin.init2
-rw-r--r--package/gkrellmd/files/gkrellmd.init2
-rw-r--r--package/gmediaserver/files/gmediaserver.init2
-rw-r--r--package/heimdal/files/heimdal.init6
-rw-r--r--package/htpdate/files/htpdate.init2
-rw-r--r--package/iptables/Makefile14
-rw-r--r--package/iptables/files/iptables.postinst5
-rw-r--r--package/iptables/files/l7/aim.pat27
-rw-r--r--package/iptables/files/l7/bittorrent.pat14
-rw-r--r--package/iptables/files/l7/edonkey-dl.pat8
-rw-r--r--package/iptables/files/l7/edonkey.pat29
-rw-r--r--package/iptables/files/l7/fasttrack.pat25
-rw-r--r--package/iptables/files/l7/ftp.pat34
-rw-r--r--package/iptables/files/l7/gnutella.pat36
-rw-r--r--package/iptables/files/l7/http.pat28
-rw-r--r--package/iptables/files/l7/ident.pat14
-rw-r--r--package/iptables/files/l7/irc.pat20
-rw-r--r--package/iptables/files/l7/jabber.pat24
-rw-r--r--package/iptables/files/l7/msnmessenger.pat15
-rw-r--r--package/iptables/files/l7/ntp.pat17
-rw-r--r--package/iptables/files/l7/pop3.pat50
-rw-r--r--package/iptables/files/l7/smtp.pat39
-rw-r--r--package/iptables/files/l7/ssl.pat15
-rw-r--r--package/iptables/files/l7/vnc.pat23
-rw-r--r--package/krb5/files/krb5.init4
-rw-r--r--package/lighttpd/files/lighttpd.init2
-rw-r--r--package/maradns/files/maradns.init2
-rw-r--r--package/mini_httpd/files/mini_httpd.init2
-rw-r--r--package/miredo/files/miredo-server.init2
-rw-r--r--package/miredo/files/miredo.init2
-rw-r--r--package/monit/files/monit.init2
-rw-r--r--package/mpd/files/mpd.conf1
-rw-r--r--package/mpd/files/mpd.init4
-rw-r--r--package/mpd/files/mpd.postinst2
-rw-r--r--package/mrd6/files/mrd6.init2
-rw-r--r--package/mt-daapd/files/mt-daapd.init2
-rw-r--r--package/net-snmp/files/snmpd.init2
-rw-r--r--package/netperf/files/netserver.init2
-rw-r--r--package/nfs-utils/files/nfsd.init10
-rw-r--r--package/nut/files/upsd.init2
-rw-r--r--package/opensips/files/opensips.init2
-rw-r--r--package/openvpn/files/openvpn.init2
-rw-r--r--package/osiris/files/osirisd.init2
-rw-r--r--package/p910nd/files/p910nd.init2
-rw-r--r--package/parprouted/files/parprouted.init2
-rw-r--r--package/php/files/php.init2
-rw-r--r--package/pmacct/files/nfacctd.init2
-rw-r--r--package/pmacct/files/pmacctd.init2
-rw-r--r--package/pptpd/files/pptpd.init2
-rw-r--r--package/radvd/files/radvd.init2
-rw-r--r--package/rarpd/files/rarpd.init2
-rw-r--r--package/reaim/files/reaim.init2
-rw-r--r--package/rp-pppoe/files/pppoe-relay.init2
-rw-r--r--package/rp-pppoe/files/pppoe-server.init2
-rw-r--r--package/rrdcollect/files/rrdcollect.init2
-rw-r--r--package/samba/files/samba.init4
-rw-r--r--package/scanlogd/files/scanlogd.init2
-rw-r--r--package/siproxd/files/siproxd.init2
-rw-r--r--package/snort-wireless/files/snort-wireless.init2
-rw-r--r--package/snort/files/snort.init2
-rw-r--r--package/srelay/files/srelay.init2
-rw-r--r--package/subversion/files/svnserve.init2
-rw-r--r--package/syslog-ng/files/syslog-ng.init2
-rw-r--r--package/tinyproxy/files/tinyproxy.init2
-rw-r--r--package/tor/files/tor.init2
-rw-r--r--package/vrrpd/files/vrrpd.init2
-rw-r--r--package/vsftpd/files/vsftpd.init2
-rw-r--r--package/watchdog/files/watchdog.init2
-rw-r--r--package/xinetd/files/xinetd.init2
89 files changed, 91 insertions, 511 deletions
diff --git a/TODO b/TODO
index fa99e3e1e..f9bf804c1 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
-- fix init scripts pidof? vs. killall
-- rpm package backend
+- make rpm package backend working
- freebsd build
- win cygwin build
- netbsd build
@@ -9,4 +8,3 @@
- network scripts for pppoe
- customise mconf help texts to better fit for OpenADK
- publish via trac
-
diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init
index bc11e0b4c..61572bf0f 100644
--- a/package/axtls/files/axhttpd.init
+++ b/package/axtls/files/axhttpd.init
@@ -17,7 +17,7 @@ start)
/usr/sbin/axhttpd >>/var/log/axhttpd.access
;;
stop)
- killall axhttpd
+ pkill axhttpd
;;
restart)
sh $0 stop
diff --git a/package/bind/files/named.init b/package/bind/files/named.init
index ce0c0abfa..b2052c1d3 100644
--- a/package/bind/files/named.init
+++ b/package/bind/files/named.init
@@ -15,7 +15,7 @@ autostop) ;;
fi
;;
stop)
- killall named
+ pkill named
;;
restart)
sh $0 stop
diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init
index 1ff40c754..491b741c7 100644
--- a/package/bitlbee/files/bitlbee.init
+++ b/package/bitlbee/files/bitlbee.init
@@ -14,7 +14,7 @@ start)
bitlbee -D
;;
stop)
- killall bitlbee
+ pkill bitlbee
;;
restart)
sh $0 stop
diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init
index 6a61d38cd..477013d9f 100644
--- a/package/bluez/files/bluez.init
+++ b/package/bluez/files/bluez.init
@@ -13,7 +13,7 @@ start)
bluetoothd
;;
stop)
- killall bluetoothd
+ pkill bluetoothd
;;
restart)
sh $0 stop
diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init
index ff041aed4..093e81f01 100644
--- a/package/busybox/files/inetd.init
+++ b/package/busybox/files/inetd.init
@@ -14,7 +14,7 @@ start)
autostop)
;;
stop)
- killall inetd
+ pkill inetd
;;
restart)
sh $0 stop
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
index 9552dfe0a..cbf0165c9 100644
--- a/package/busybox/files/syslog.init
+++ b/package/busybox/files/syslog.init
@@ -14,8 +14,8 @@ start)
klogd
;;
stop)
- killall klogd
- killall syslogd
+ pkill klogd
+ pkill syslogd
;;
restart)
sh $0 stop
diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init
index 308668fca..8a09a3d35 100644
--- a/package/chillispot/files/chillispot.init
+++ b/package/chillispot/files/chillispot.init
@@ -13,7 +13,7 @@ start)
chilli
;;
stop)
- killall chilli
+ pkill chilli
;;
restart)
sh $0 stop
diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init
index 601dd53d4..468c6fa11 100644
--- a/package/collectd/files/collectd.init
+++ b/package/collectd/files/collectd.init
@@ -14,7 +14,7 @@ start)
collectd
;;
stop)
- killall collectd
+ pkill collectd
;;
restart)
sh $0 stop
diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init
index 03be3300f..49c37b24f 100644
--- a/package/cups/files/cupsd.init
+++ b/package/cups/files/cupsd.init
@@ -16,7 +16,7 @@ start)
/usr/sbin/cupsd -c /etc/cups/cupsd.conf
;;
stop)
- killall cupsd
+ pkill cupsd
;;
restart)
sh $0 stop
diff --git a/package/dansguardian/files/dansguardian.init b/package/dansguardian/files/dansguardian.init
index 8c883d4bf..2f2547f12 100644
--- a/package/dansguardian/files/dansguardian.init
+++ b/package/dansguardian/files/dansguardian.init
@@ -11,10 +11,14 @@ autostart)
exec sh $0 start
;;
start)
+ if [ ! -f /var/log/dansguardian-access.log ];then
+ touch /var/log/dansguardian-access.log
+ chown proxy:proxy /var/log/dansguardian-access.log
+ fi
dansguardian
;;
stop)
- killall dansguardian
+ pkill dansguardian
;;
restart)
sh $0 stop
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 3484c4522..0f7367f38 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -14,7 +14,7 @@ start)
dbus-daemon --config-file=/etc/dbus-1/system.conf
;;
stop)
- killall dbus-daemon
+ pkill dbus-daemon
;;
restart)
sh $0 stop
diff --git a/package/dhcp-forwarder/files/dhcp-fwd.init b/package/dhcp-forwarder/files/dhcp-fwd.init
index 8e6cda234..1a193f2ae 100644
--- a/package/dhcp-forwarder/files/dhcp-fwd.init
+++ b/package/dhcp-forwarder/files/dhcp-fwd.init
@@ -13,7 +13,7 @@ start)
dhcp-fwd
;;
stop)
- killall dhcp-fwd
+ pkill dhcp-fwd
;;
restart)
sh $0 stop
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index 6ba76df9f..acdfc501f 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -14,7 +14,7 @@ start)
dhcpd $dhcpd_flags
;;
autostop|stop)
- killall dhcpd
+ pkill dhcpd
;;
restart)
sh $0 stop
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index be9218bcb..01ca2cca6 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -14,7 +14,7 @@ start)
/usr/sbin/dnsmasq
;;
stop)
- killall dnsmasq
+ pkill dnsmasq
;;
restart)
sh $0 stop
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 09eea25e4..1c4c33745 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -30,7 +30,7 @@ start)
/usr/sbin/dropbear $dropbear_flags
;;
stop)
- killall dropbear
+ pkill dropbear
;;
restart)
sh $0 stop
diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init
index 0f60c59e5..fd2ebf877 100644
--- a/package/esound/files/esd.init
+++ b/package/esound/files/esd.init
@@ -12,7 +12,7 @@ start)
esd -d /dev/sound/dsp -public -tcp -nobeeps
;;
stop)
- killall esd
+ pkill esd
;;
restart)
sh $0 stop
diff --git a/package/ez-ipupdate/files/ez-ipupdate.init b/package/ez-ipupdate/files/ez-ipupdate.init
index c6fbfc39e..ea784481c 100644
--- a/package/ez-ipupdate/files/ez-ipupdate.init
+++ b/package/ez-ipupdate/files/ez-ipupdate.init
@@ -13,7 +13,7 @@ start)
/usr/sbin/ez-ipupdate -c /etc/ez-ipupdate.conf -d
;;
stop)
- killall ez-ipupdate
+ pkill ez-ipupdate
;;
restart)
sh $0 stop
diff --git a/package/fakeidentd/files/fakeidentd.init b/package/fakeidentd/files/fakeidentd.init
index d145a6906..652ee02df 100644
--- a/package/fakeidentd/files/fakeidentd.init
+++ b/package/fakeidentd/files/fakeidentd.init
@@ -13,7 +13,7 @@ start)
fakeidentd ${fakeidentd_flags}
;;
stop)
- killall fakeidentd
+ pkill fakeidentd
;;
restart)
sh $0 stop
diff --git a/package/freeradius-server/files/radiusd.init b/package/freeradius-server/files/radiusd.init
index 818f803ff..e43c5f94e 100644
--- a/package/freeradius-server/files/radiusd.init
+++ b/package/freeradius-server/files/radiusd.init
@@ -14,7 +14,7 @@ start)
radiusd
;;
stop)
- killall radiusd
+ pkill radiusd
;;
restart)
sh $0 stop
diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init
index 4e63232c0..baf5d9c18 100644
--- a/package/frickin/files/frickin.init
+++ b/package/frickin/files/frickin.init
@@ -13,7 +13,7 @@ start)
frickin ${frickin_flags}
;;
stop)
- killall frickin
+ pkill frickin
;;
restart)
sh $0 stop
diff --git a/package/gkrellmd/files/gkrellmd.init b/package/gkrellmd/files/gkrellmd.init
index dfbf7dc5f..79b998713 100644
--- a/package/gkrellmd/files/gkrellmd.init
+++ b/package/gkrellmd/files/gkrellmd.init
@@ -13,7 +13,7 @@ start)
gkrellmd -d
;;
stop)
- killall gkrellmd
+ pkill gkrellmd
;;
restart)
sh $0 stop
diff --git a/package/gmediaserver/files/gmediaserver.init b/package/gmediaserver/files/gmediaserver.init
index 81deeb899..1c67e5f40 100644
--- a/package/gmediaserver/files/gmediaserver.init
+++ b/package/gmediaserver/files/gmediaserver.init
@@ -13,7 +13,7 @@ autostop) ;;
gmediaserver $gmediaserver_flags
;;
stop)
- killall gmediaserver
+ pkill gmediaserver
;;
restart)
sh $0 stop
diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init
index 2e87f4932..33692f111 100644
--- a/package/heimdal/files/heimdal.init
+++ b/package/heimdal/files/heimdal.init
@@ -15,9 +15,9 @@ start)
/usr/sbin/kpasswdd &
;;
stop)
- killall kdc
- killall kadmind
- killall kpasswdd
+ pkill kdc
+ pkill kadmind
+ pkill kpasswdd
;;
restart)
sh $0 stop
diff --git a/package/htpdate/files/htpdate.init b/package/htpdate/files/htpdate.init
index 4457e4391..0b3f34ad6 100644
--- a/package/htpdate/files/htpdate.init
+++ b/package/htpdate/files/htpdate.init
@@ -14,7 +14,7 @@ start)
htpdate -l -s -t $htpdate_flags && htpdate -D $htpdate_flags
;;
stop)
- killall htpdate
+ pkill htpdate
;;
restart)
sh $0 stop