diff options
| author | hawk | 2011-03-21 09:54:56 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 9069281084becc38ddf762a0250cf1d6e92e84f8 (patch) | |
| tree | a73e55800b1614fde3548182423befdf7bdfcb05 | |
| parent | 1adb9050fd15e4427b71e55ae0db5b8e6ece9ad8 (diff) | |
| download | c-icap-9069281084becc38ddf762a0250cf1d6e92e84f8.zip c-icap-9069281084becc38ddf762a0250cf1d6e92e84f8.tar.gz | |
- fixed config, log, pid and example paths
- run with group c-icap
Changed files:
c-icap-conf.patch -> 1.2
| -rw-r--r-- | c-icap-conf.patch | 62 |
1 files changed, 51 insertions, 11 deletions
diff --git a/c-icap-conf.patch b/c-icap-conf.patch index a176a59..8f99240 100644 --- a/c-icap-conf.patch +++ b/c-icap-conf.patch @@ -1,6 +1,17 @@ diff -ur c_icap-0.1.4.orig//c-icap.conf.in c_icap-0.1.4.mod//c-icap.conf.in --- c_icap-0.1.4.orig//c-icap.conf.in 2010-05-29 17:36:42.000000000 +0200 -+++ c_icap-0.1.4.mod//c-icap.conf.in 2011-03-18 14:55:07.559710803 +0100 ++++ c_icap-0.1.4.mod//c-icap.conf.in 2011-03-21 10:41:03.879540951 +0100 +@@ -9,8 +9,8 @@ + # Description: + # The file to store the pid of the main process of the c-icap server. + # Default: +-# PidFile /var/run/c-icap/c-icap.pid +-PidFile /var/run/c-icap/c-icap.pid ++# PidFile /var/run/c-icap.pid ++PidFile /var/run/c-icap.pid + + # TAG: CommandsSocket + # Format: CommandsSocket socket_file @@ -119,6 +119,7 @@ # No value # Example: @@ -9,11 +20,13 @@ diff -ur c_icap-0.1.4.orig//c-icap.conf.in c_icap-0.1.4.mod//c-icap.conf.in # TAG: Group # Format: Group groupname -@@ -129,6 +130,7 @@ +@@ -128,7 +129,8 @@ + # Default: # No value # Example: - # Group nogroup -+Group nogroup +-# Group nogroup ++# Group c-icap ++Group c-icap # TAG: ServerAdmin # Format: ServerAdmin admin_mail @@ -53,19 +66,46 @@ diff -ur c_icap-0.1.4.orig//c-icap.conf.in c_icap-0.1.4.mod//c-icap.conf.in # Default: -# LoadMagicFile @prefix@/etc/c-icap.magic -LoadMagicFile @prefix@/etc/c-icap.magic -+# LoadMagicFile /etc/c-icap.magic -+LoadMagicFile /etc/c-icap.magic ++# LoadMagicFile /etc/c-icap/c-icap.magic ++LoadMagicFile /etc/c-icap/c-icap.magic # TAG: RemoteProxyUsers # Format: RemoteProxyUsers onoff +@@ -289,7 +291,7 @@ + # Default: + # No value + # Example: +-# basic_simple_db.UsersDB hash:/usr/local/c-icap/etc/c-icap-users.txt ++# basic_simple_db.UsersDB hash:/etc/c-icap-users.txt + + # TAG: GroupSourceByGroup + # Format: GroupSourceByGroup LookupTable +@@ -301,7 +303,7 @@ + # Default: + # No set + # Example: +-# GroupSourceByGroup hash:/usr/local/c-icap/etc/c-icap-groups.txt ++# GroupSourceByGroup hash:/etc/c-icap-groups.txt + + # TAG: GroupSourceByUser + # Format: GroupSourceByUser LookupTable +@@ -313,7 +315,7 @@ + # Default: + # No set + # Example: +-# GroupSourceByUser hash:/usr/local/c-icap/etc/c-icap-user-groups.txt ++# GroupSourceByUser hash:/etc/c-icap-user-groups.txt + + # TAG: acl + # Format: acl name type[{param}] value1 [value2] [...] @@ -443,8 +445,8 @@ # store debugging information, errors and other # information about the c-icap server. # Default: -# ServerLog @prefix@/var/log/server.log -ServerLog @prefix@/var/log/server.log -+# ServerLog /var/log/server.log -+ServerLog /var/log/server.log ++# ServerLog /var/log/c-icap/server.log ++ServerLog /var/log/c-icap/server.log # TAG: AccessLog # Format: AccessLog LogFile [LogFormat] [[!]acl1] [[!]acl2] [...] @@ -74,12 +114,12 @@ diff -ur c_icap-0.1.4.orig//c-icap.conf.in c_icap-0.1.4.mod//c-icap.conf.in # one access log files # Default: -# AccessLog @prefix@/var/log/access.log -+# AccessLog /var/log/access.log ++# AccessLog /var/log/c-icap/access.log # Example: -# AccessLog @prefix@/var/log/access.log MyFormat all -AccessLog @prefix@/var/log/access.log -+# AccessLog /var/log/access.log MyFormat all -+AccessLog /var/log/access.log ++# AccessLog /var/log/c-icap/access.log MyFormat all ++AccessLog /var/log/c-icap/access.log # TAG: Logger # Format: Logger LoggerName |