From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 6 May 2007 18:02:18 +0000 (+0000)
Subject: Wrapper eingebaut zur Verwendung von URL-Filter und Update-Booster zur gleichen Zeit.
X-Git-Tag: v2.3-beta1~722
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a1d6b605f56487d88d82174d4813f95382564f6b

Wrapper eingebaut zur Verwendung von URL-Filter und Update-Booster zur gleichen Zeit.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@537 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/procmail/procmailrc b/config/procmail/procmailrc
deleted file mode 100644
index d2f27ef708..0000000000
--- a/config/procmail/procmailrc
+++ /dev/null
@@ -1,33 +0,0 @@
-# Procmail
-LOGFILE="/var/log/procmail"
-VERBOSE=off 
-
-# Mailbox-Zustellung
-DELIVERMAIL="/usr/cyrus/bin/deliver"
-INBOX="$DELIVERMAIL -r $SENDER -m $EXTENSION $USER"
-SPAM="$DELIVERMAIL -e -a $USER -q -m user.$USER.spam"
-
-# "From" Zeile loeschen, sonst funktioniert cydeliver nicht
-:0fw
-| formail -f -I "From "
-
-:0fw
-* < 256000
-| /usr/bin/spamc -u filter
-
-# --- score = 11
-
-:0 w
-* ^X-Spam-Level: \*\*\*\*\*\*\*\*\*\*\*
-| $SPAM
-
-# Der Mailbox zustellen
-:0w
-| $INBOX
-
-# Schluss
-:0w
-{
-EXITCODE=$?
-HOST
-}
diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard
index 61bad5884a..5ce49c1eae 100644
--- a/config/rootfiles/common/squidguard
+++ b/config/rootfiles/common/squidguard
@@ -2,6 +2,7 @@
 etc/squidGuard/squidGuard.conf
 srv/web/ipfire/html/repository
 usr/bin/squidGuard
+usr/sbin/redirect_wrapper
 var/ipfire/urlfilter/autoupdate/autoupdate.urls
 var/ipfire/urlfilter/autoupdate/cron.daily
 var/ipfire/urlfilter/autoupdate/cron.monthly
diff --git a/config/urlfilter/redirect_wrapper b/config/urlfilter/redirect_wrapper
new file mode 100644
index 0000000000..f81d81a389
--- /dev/null
+++ b/config/urlfilter/redirect_wrapper
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/squidGuard | /usr/sbin/updxlrator
diff --git a/config/xinetd/swat b/config/xinetd/swat
deleted file mode 100644
index fb129b0d0e..0000000000
--- a/config/xinetd/swat
+++ /dev/null
@@ -1,14 +0,0 @@
-# Begin /var/ipfire/xinetd/xinetd.d/swat
-
-service swat
-{
-    port            = 901
-    socket_type     = stream
-    wait            = no
-#    only_from       = 127.0.0.1
-    user            = root
-    server          = /usr/sbin/swat
-    log_on_failure  += USERID
-}
-
-# End /var/ipfire/xinetd/xinetd.d/swat
diff --git a/config/xinetd/tftpd-hpa b/config/xinetd/tftpd-hpa
deleted file mode 100644
index 18298de446..0000000000
--- a/config/xinetd/tftpd-hpa
+++ /dev/null
@@ -1,17 +0,0 @@
-# description: The tftp server serves files using the trivial file transfer \
-#	protocol.  The tftp protocol is often used to boot diskless \
-#	workstations, download configuration files to network-aware printers, \
-#	and to start the installation process for some operating systems.
-service tftp
-{
-	socket_type		= dgram
-	protocol		= udp
-	wait			= yes
-	user			= root
-	server			= /usr/sbin/in.tftpd
-	server_args		= -s /var/log/tftpboot
-	disable			= no
-	per_source		= 11
-	cps			= 100 2
-	flags			= IPv4
-}
diff --git a/lfs/samba b/lfs/samba
index 49f47cf6ac..5fd52de3ad 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -102,7 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/source && ln -v -sf libnss_wins.so /lib/libnss_wins.so.2
 #	cd $(DIR_APP)/source && install -v -m755 nsswitch/pam_winbind.so /lib/security
 	cd $(DIR_APP)/source && install -v -m644 ../examples/smb.conf.default /var/ipfire/samba
-	cp -f $(DIR_CONF)/xinetd/swat /var/ipfire/xinetd/xinetd.d/
 	-mkdir -p /var/ipfire/samba	
 	cp -vrf $(DIR_SRC)/config/samba/* /var/ipfire/samba/
 	chown nobody:nobody -R /var/ipfire/samba/
diff --git a/lfs/squidguard b/lfs/squidguard
index def559bd60..8a53878d95 100644
--- a/lfs/squidguard
+++ b/lfs/squidguard
@@ -94,6 +94,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -f  $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl
 	chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl
 	echo "1.7.1" > /var/ipfire/urlfilter/version
+	
+	# Wrapper
+	cp -f  $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin
+	chmod 755 /usr/sbin/redirect_wrapper
 
 	/bin/tar --no-same-owner -xzf $(DIR_CONF)/urlfilter/blacklists.tar.gz -C /var/ipfire/urlfilter
 	/usr/bin/perl $(DIR_CONF)/urlfilter/makeconf.pl