aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3/34
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-05-06 08:40:42 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-05-06 08:40:42 -0300
commit7bf30eb704d309353cacd4b34bde6bb6bfee4cad (patch)
treed1bfba58fd9c4f7005b16833ffadd696bc35f78a /config/squid3/34
parent45452e58e23b67e5d85f53f39a7fe22cb4ccc66a (diff)
downloadpfsense-packages-7bf30eb704d309353cacd4b34bde6bb6bfee4cad.tar.gz
pfsense-packages-7bf30eb704d309353cacd4b34bde6bb6bfee4cad.tar.bz2
pfsense-packages-7bf30eb704d309353cacd4b34bde6bb6bfee4cad.zip
Install check_ip.php direct to /usr/local/bin, and, on 2.2, create a symlink inside PBI directory
Diffstat (limited to 'config/squid3/34')
-rwxr-xr-xconfig/squid3/34/squid.inc6
-rw-r--r--config/squid3/34/squid.xml2
2 files changed, 5 insertions, 3 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index ee1d8b97..63db45b8 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -181,8 +181,10 @@ function squid_install_command() {
if (is_array($config['installedpackages']['squid']['config']))
$settingsgen = $config['installedpackages']['squid']['config'][0];
- if (file_exists("/usr/local/pkg/check_ip.php"))
- rename("/usr/local/pkg/check_ip.php", SQUID_BASE . "/bin/check_ip.php");
+ if (SQUID_BASE != '/usr/local' &&
+ file_exists('/usr/local/bin/check_ip.php') &&
+ !file_exists(SQUID_BASE . '/bin/check_ip.php'))
+ symlink("/usr/local/bin/check_ip.php", SQUID_BASE . "/bin/check_ip.php");
/* Set storage system */
if ($g['platform'] == "nanobsd") {
diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml
index 57dfc938..3f869f6e 100644
--- a/config/squid3/34/squid.xml
+++ b/config/squid3/34/squid.xml
@@ -249,7 +249,7 @@
<item>https://packages.pfsense.org/packages/config/squid3/34/pkg_squid.inc</item>
</additional_files_needed>
<additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
+ <prefix>/usr/local/bin/</prefix>
<chmod>0755</chmod>
<item>https://packages.pfsense.org/packages/config/squid3/34/check_ip.php</item>
</additional_files_needed>