diff options
| author | Adam Gensler <openwrt@a.gnslr.us> | 2017-01-08 10:12:57 -0500 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2017-11-12 23:14:26 +0100 |
| commit | 3e972a57c62d58914d5bcdd5d4789f96aa227a29 (patch) | |
| tree | 7517ff9acbc94ce369d15a02d7a94bacb11cc4f3 | |
| parent | 92fa2b3895ac3577fec0fdf533818c1758916682 (diff) | |
net/squid: Allow squid to parse mime.conf
Copy mime.conf to temporary directory so squid process can properly read the file. Without it squid cannot access mime.conf and throws a warning during startup.
Signed-off by: Adam Gensler <openwrt@a.gnslr.us>
| -rw-r--r-- | net/squid/files/squid.config | 4 | ||||
| -rw-r--r-- | net/squid/files/squid.init | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/net/squid/files/squid.config b/net/squid/files/squid.config index 4c0daae95..327ecef7c 100644 --- a/net/squid/files/squid.config +++ b/net/squid/files/squid.config @@ -3,3 +3,7 @@ config squid 'squid' option http_port '3128' option coredump_dir '/tmp/squid' option visible_hostname 'OpenWrt' + option mime_table '/etc/squid/mime.conf' + #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 8b3094840..177b1490c 100644 --- a/net/squid/files/squid.init +++ b/net/squid/files/squid.init @@ -7,6 +7,7 @@ STOP=10 USE_PROCD=1 PROG=/usr/sbin/squid CONFIGFILE="/tmp/squid/squid.conf" +MIMETABLE="/tmp/squid/mime.conf" validate_squid_section() { uci_validate_section squid squid "${1}" \ @@ -14,7 +15,8 @@ validate_squid_section() { 'http_port:port:3128' \ 'coredump_dir:string' \ 'visible_hostname:string:OpenWrt' \ - 'pinger_enable:string:off' + 'pinger_enable:string:off' \ + 'mime_table:string:/etc/squid/mime.conf' } start_service() { @@ -33,6 +35,9 @@ start_service() { echo visible_hostname $visible_hostname >> $CONFIGFILE echo pinger_enable $pinger_enable >> $CONFIGFILE + cat $mime_table > $MIMETABLE + echo mime_table $MIMETABLE >> $CONFIGFILE + procd_open_instance procd_set_param command $PROG -s -f $CONFIGFILE -N procd_set_param file $CONFIGFILE |