aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs@pfsense.org>2008-08-20 20:40:46 +0000
committerMartin Fuchs <mfuchs@pfsense.org>2008-08-20 20:40:46 +0000
commitc3e2d46fea789ba9dccbf782f8fff636f99109b6 (patch)
tree9ea6b6ccab399061ee776a372553ba4648a3574a
parent1197d84f577866a2617612e194753f15780ac483 (diff)
downloadpfsense-packages-c3e2d46fea789ba9dccbf782f8fff636f99109b6.tar.gz
pfsense-packages-c3e2d46fea789ba9dccbf782f8fff636f99109b6.tar.bz2
pfsense-packages-c3e2d46fea789ba9dccbf782f8fff636f99109b6.zip
added icondir in squid-cfg
-rw-r--r--packages/squid/squid.inc4
-rw-r--r--packages/squid3/squid.inc2
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc
index 5e2f08e7..1abcafc8 100644
--- a/packages/squid/squid.inc
+++ b/packages/squid/squid.inc
@@ -523,7 +523,8 @@ function squid_resync_general() {
$pidfile = "{$g['varrun_path']}/squid.pid";
$language = ($settings['error_language'] ? $settings['error_language'] : 'English');
$errordir = SQUID_CONFBASE . '/errors/' . $language;
- $hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
+ $icondir = SQUID_CONFBASE . '/icons/';
+ $hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
$email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost');
$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log');
@@ -538,6 +539,7 @@ pid_filename $pidfile
cache_effective_user proxy
cache_effective_group proxy
error_directory $errordir
+icon_directory $icondir
visible_hostname $hostname
cache_mgr $email
access_log $logdir_access
diff --git a/packages/squid3/squid.inc b/packages/squid3/squid.inc
index c383c3ce..45b25c74 100644
--- a/packages/squid3/squid.inc
+++ b/packages/squid3/squid.inc
@@ -523,6 +523,7 @@ function squid_resync_general() {
$pidfile = "{$g['varrun_path']}/squid.pid";
$language = ($settings['error_language'] ? $settings['error_language'] : 'English');
$errordir = SQUID_CONFBASE . '/errors/' . $language;
+ $icondir = SQUID_CONFBASE . '/icons/';
$hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
$email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost');
@@ -538,6 +539,7 @@ pid_filename $pidfile
cache_effective_user proxy
cache_effective_group proxy
error_directory $errordir
+icon_directory $icondir
visible_hostname $hostname
cache_mgr $email
access_log $logdir_access