File c_icap-060708rc1.patch of Package c-icap

File c_icap-060708rc1.patch of Package c-icap (Revision d2cfa0cd837f8c3451331192cddfdcc6)

Currently displaying revision d2cfa0cd837f8c3451331192cddfdcc6, show latest

--- c-icap.conf.in	2008-07-06 23:22:32.000000000 +0400
+++ c-icap.conf.in	2009-01-27 18:11:11.000000000 +0300
@@ -3,8 +3,8 @@
 #
 
 
 PidFile /var/run/c-icap.pid
-CommandsSocket /var/run/c-icap/c-icap.ctl
+CommandsSocket /var/spool/c_icap/c-icap.ctl
 Timeout 300
 KeepAlive On
 MaxKeepAliveRequests 100
@@ -19,18 +19,18 @@
 
 
 Port 1344 
-User wwwrun
+User vscan
 Group nobody
 
 
 #ServerAdmin you@your.address # Not implemented yet
 #ServerName localhost:1344 # Not implemented yet
 
-TmpDir /var/tmp
+TmpDir /var/spool/c_icap/tmp
 MaxMemObject 131072
 
-ServerLog @prefix@/var/log/server.log
-AccessLog @prefix@/var/log/access.log
+ServerLog /var/log/c_icap/server.log
+AccessLog /var/log/c_icap/access.log
 #DebugLevel 3
 
 ModulesDir @prefix@/lib/c_icap
@@ -56,21 +56,27 @@
 ## acl and icap_access  are aliases for default_acl.acl and default_acl.icap_access 
 #acl localnet_options src 192.168.1.0/255.255.255.0 type options
 #acl localnet_respmod src 192.168.1.0/255.255.255.0 type respmod
+acl localnet_respmod src 127.0.0.1 type respmod
 #acl localnet src 192.168.1.0/255.255.255.0
+acl localnet src 127.0.0.1
 ##Use the folllowing to demand use of username ......
 ##acl localnet src 192.168.1.0/255.255.255.0 user *
 #acl externalnet src 0.0.0.0/0.0.0.0
+acl externalnet src 0.0.0.0/0.0.0.0
 #acl barbarian src 192.168.1.5
 
 ##An example to specify access to server
 #icap_access deny barbarian
 #icap_access allow localnet_options
 #icap_access allow localnet_respmod
+icap_access allow localnet_respmod
 #icap_access allow localnet
+icap_access allow localnet
 ## http_auth mean that the icap server must try to authenticate the request
 ## using the http headers ....
 #icap_access  http_auth localnet
 #icap_access deny externalnet
+icap_access deny externalnet
 
 #Also you can specify which hosts to log or not.
 # Comment out the folowing two lines to log only the external net
@@ -122,10 +128,10 @@
 
 # And here the viralator-like mode.
 # where to save documents
-srv_clamav.VirSaveDir /srv/www/htdocs/downloads/
+#srv_clamav.VirSaveDir /srv/www/htdocs/downloads/
 # from where the documents can be retrieved (you can find the get_file.pl script in contrib dir)
-srv_clamav.VirHTTPServer  "http://fortune/cgi-bin/get_file.pl?usename=%f&remove=1&file="
+#srv_clamav.VirHTTPServer  "http://fortune/cgi-bin/get_file.pl?usename=%f&remove=1&file="
 # The refresh  rate....
-srv_clamav.VirUpdateTime   15
+#srv_clamav.VirUpdateTime   15
 # For which filetypes the "virelator like mode" will be used.
-srv_clamav.VirScanFileTypes ARCHIVE EXECUTABLE
+#srv_clamav.VirScanFileTypes ARCHIVE EXECUTABLE

--- Makefile.am	2008-07-07 00:31:43.000000000 +0400
+++ Makefile.am	2009-01-28 11:45:04.000000000 +0300
@@ -5,7 +5,7 @@
 SERVICESDIR=$(pkglibdir)/
 #CONFIGDIR=$(sysconfdir)/
 LOGDIR=$(localstatedir)/log/
-SOCKDIR=/var/run/c-icap
+SOCKDIR=$(localstatedir)/spool/c_icap
 
 
 SUBDIRS =  . modules services

--- Makefile.in	2008-07-29 22:36:40.000000000 +0400
+++ Makefile.in	2009-02-10 09:46:13.000000000 +0300
@@ -279,7 +279,7 @@
 SERVICESDIR = $(pkglibdir)/
 #CONFIGDIR=$(sysconfdir)/
 LOGDIR = $(localstatedir)/log/
-SOCKDIR = /var/run/c-icap
+SOCKDIR = $(localstatedir)/spool/c_icap
 SUBDIRS = . modules services
 lib_LTLIBRARIES = libicapapi.la
 UTIL_SOURCES = net_io.c os/unix/net_io.c os/unix/proc_mutex.c os/unix/shared_mem.c os/unix/threads.c os/unix/utilfunc.c os/unix/proc_utils.c os/unix/dlib.c
@@ -1306,9 +1306,9 @@
 	if test ! -f $(DESTDIR)$(CONFIGDIR)/c-icap.magic; then $(INSTALL) c-icap.magic $(DESTDIR)$(CONFIGDIR)/c-icap.magic; fi
 	$(mkinstalldirs)  $(DESTDIR)$(LOGDIR); 
 	$(mkinstalldirs)  $(DESTDIR)$(SOCKDIR);
-	chgrp nobody $(DESTDIR)$(LOGDIR)
+#	chgrp nobody $(DESTDIR)$(LOGDIR)
 	chmod 775 $(DESTDIR)$(LOGDIR)
-	chgrp nobody $(DESTDIR)$(SOCKDIR)
+#	chgrp nobody $(DESTDIR)$(SOCKDIR)
 	chmod 775 $(DESTDIR)$(SOCKDIR)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.