diff options
| author | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2015-07-20 16:12:45 -0700 |
|---|---|---|
| committer | Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> | 2015-07-20 16:12:45 -0700 |
| commit | b127de865b48c082a6e365737954d585fc29c428 (patch) | |
| tree | a6e0ab34536f2eedb8faf523d32ef4cb22fec50f /net/squid/files | |
| parent | 6a56edca27ba2db9b3a8114ece78b08f64a37cf0 (diff) | |
squid: version bump and dependency fixes
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Diffstat (limited to 'net/squid/files')
| -rw-r--r-- | net/squid/files/squid.conf | 2 | ||||
| -rw-r--r-- | net/squid/files/squid.config | 3 | ||||
| -rw-r--r-- | net/squid/files/squid.init | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/net/squid/files/squid.conf b/net/squid/files/squid.conf index 96333ad7e..9535c1d6d 100644 --- a/net/squid/files/squid.conf +++ b/net/squid/files/squid.conf @@ -38,7 +38,7 @@ refresh_pattern . 0 20% 4320 access_log none cache_log /dev/null -cache_store_log /dev/null +cache_store_log stdio:/dev/null logfile_rotate 0 logfile_daemon /dev/null diff --git a/net/squid/files/squid.config b/net/squid/files/squid.config index 4c0daae95..e7818608e 100644 --- a/net/squid/files/squid.config +++ b/net/squid/files/squid.config @@ -3,3 +3,6 @@ config squid 'squid' option http_port '3128' option coredump_dir '/tmp/squid' option visible_hostname 'OpenWrt' + #option http_port_options 'intercept' + #option ssldb '/tmp/squid/ssldb' + #option ssldb_options '-M 4MB' diff --git a/net/squid/files/squid.init b/net/squid/files/squid.init index 35d86c877..76ec756c4 100644 --- a/net/squid/files/squid.init +++ b/net/squid/files/squid.init @@ -12,13 +12,16 @@ validate_squid_section() { uci_validate_section squid squid "${1}" \ 'config_file:string' \ 'http_port:port:3128' \ + 'http_port_options:string' \ + 'ssldb:string' \ + 'ssldb_options:string' \ 'coredump_dir:string' \ 'visible_hostname:string:OpenWrt' \ 'pinger_enable:string:off' } start_service() { - local config_file http_port coredump_dir visible_hostname pinger_enable + local config_file http_port http_port_options ssldb ssldb_options coredump_dir visible_hostname pinger_enable validate_squid_section squid || { echo "validation failed" @@ -28,12 +31,15 @@ start_service() { config_dir=$(dirname $CONFIGFILE) [ -d $config_dir ] || mkdir -p $config_dir && chown nobody:nogroup $config_dir [ -d $coredump_dir ] || mkdir -p $coredump_dir && chown nobody:nogroup $coredump_dir + [ "$ssldb" ] && ( [ -f "$ssldb"/size ] || /usr/lib/squid/ssl_crtd -c -s $ssldb && chown -R nobody:nogroup $ssldb ) cat $config_file > $CONFIGFILE - echo http_port $http_port >> $CONFIGFILE + echo http_port $http_port $http_port_options >> $CONFIGFILE echo coredump_dir $coredump_dir >> $CONFIGFILE echo visible_hostname $visible_hostname >> $CONFIGFILE echo pinger_enable $pinger_enable >> $CONFIGFILE + [ "$ssldb" ] && echo sslcrtd_program /usr/lib/squid/ssl_crtd -s $ssldb $ssldb_options >> $CONFIGFILE + $PROG -s -f $CONFIGFILE -N -z 2>/dev/null procd_open_instance procd_set_param command $PROG -s -f $CONFIGFILE -N |