aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-03-13 21:09:05 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-03-13 21:09:05 +0000
commita4df57f623170025b6245f454d51bd237e46e2a1 (patch)
tree93f0b540063022867be337c8d0f20630ee407914
parent6ab8e86ee9436b734f565c6021180138f9b483fe (diff)
downloadpfsense-packages-a4df57f623170025b6245f454d51bd237e46e2a1.tar.gz
pfsense-packages-a4df57f623170025b6245f454d51bd237e46e2a1.tar.bz2
pfsense-packages-a4df57f623170025b6245f454d51bd237e46e2a1.zip
Minor cleanups. No functional changes.
-rw-r--r--packages/squidGuard.xml53
1 files changed, 26 insertions, 27 deletions
diff --git a/packages/squidGuard.xml b/packages/squidGuard.xml
index f48a67be..43ed3c3a 100644
--- a/packages/squidGuard.xml
+++ b/packages/squidGuard.xml
@@ -5,42 +5,41 @@
<!-- configpath gets expanded out automatically and config items will be
stored in that location -->
<configpath>['installedpackages']['squidGuard']['config']</configpath>
- <fields/>
<custom_php_install_command>
echo "&lt;pre&gt;";
- $fout = fopen("/usr/local/etc/squid/squidGuard.conf","w");
+ $fout = fopen("/usr/local/etc/squid/squidGuard.conf","w");
fwrite($fout, "# cat squidGuard.conf\n");
fwrite($fout, "dbhome /var/db/squidGuard\n");
fwrite($fout, "logdir /usr/local/squid/logs\n");
fwrite($fout, "acl {"\n");
- fwrite($fout, "\\t default {\n");
- fwrite($fout, "\\t pass all\n");
- fwrite($fout, "\\t }\n");
+ fwrite($fout, "\t default {\n");
+ fwrite($fout, "\t pass all\n");
+ fwrite($fout, "\t }\n");
fwrite($fout, "}\n");
- fclose($fout);
- $fout = fopen("/usr/local/etc/squid/squid.conf","w");
+ fclose($fout);
+ $fout = fopen("/usr/local/etc/squid/squid.conf","w");
fwrite($fout, "redirect_program /usr/local/bin/squidGuard -c /usr/local/etc/squid/squidGuard.conf\n");
fwrite($fout, "redirect_children 4\n");
- fclose($fout);
- exec("/usr/bin/touch /usr/local/squid/logs/squidGuard.log");
- exec("/usr/sbin/chown squid /usr/local/squid/logs/squidGuard.log");
- exec("/usr/bin/chgrp squid /usr/local/squid/logs/squidGuard.log");
- exec("/bin/chmod 744 /usr/local/squid/logs/squidGuard.log");
- exec("/usr/sbin/chown -R squid /var/db/squidGuard");
- exec("/usr/bin/chgrp -R squid /var/db/squidGuard");
- exec("/bin/chmod -R 755 /var/db/squidGuard");
- system("/usr/local/sbin/squid -k reconfigure");
+ fclose($fout);
+ mwexec("/usr/bin/touch /usr/local/squid/logs/squidGuard.log");
+ mwexec("/usr/sbin/chown squid /usr/local/squid/logs/squidGuard.log");
+ mwexec("/usr/bin/chgrp squid /usr/local/squid/logs/squidGuard.log");
+ mwexec("/bin/chmod 744 /usr/local/squid/logs/squidGuard.log");
+ mwexec("/usr/sbin/chown -R squid /var/db/squidGuard");
+ mwexec("/usr/bin/chgrp -R squid /var/db/squidGuard");
+ mwexec("/bin/chmod -R 755 /var/db/squidGuard");
+ system("/usr/local/sbin/squid -k reconfigure");
</custom_php_install_command>
<custom_php_pre_deinstall_command>
- </custom_php_pre_deinstall_command>
+ </custom_php_pre_deinstall_command>
<custom_php_deinstall_command>
- exec("/usr/bin/sed '$d' /usr/local/etc/squid/squid.conf > /tmp/squidtmp.conf");
- exec("/bin/cp /tmp/squidtmp.conf /usr/local/etc/squid/squid.conf");
- exec("/usr/bin/sed '$d' /usr/local/etc/squid/squid.conf > /tmp/squidtmp.conf");
- exec("/bin/cp /tmp/squidtmp.conf /usr/local/etc/squid/squid.conf");
- exec("/bin/rm /tmp/squidtmp.conf");
- exec("/bin/rm -rf /var/db/squidGuard");
- system("/usr/local/sbin/squid -k reconfigure");
- </custom_php_deinstall_command>
- <process_kill_command>squidGuard</process_kill_command>
-</packagegui>
+ mwexec("/usr/bin/sed '$d' /usr/local/etc/squid/squid.conf > /tmp/squidtmp.conf");
+ mwexec("/bin/cp /tmp/squidtmp.conf /usr/local/etc/squid/squid.conf");
+ mwexec("/usr/bin/sed '$d' /usr/local/etc/squid/squid.conf > /tmp/squidtmp.conf");
+ mwexec("/bin/cp /tmp/squidtmp.conf /usr/local/etc/squid/squid.conf");
+ mwexec("/bin/rm /tmp/squidtmp.conf");
+ mwexec("/bin/rm -rf /var/db/squidGuard");
+ system("/usr/local/sbin/squid -k reconfigure");
+ </custom_php_deinstall_command>
+ <process_kill_command>squidGuard</process_kill_command>
+</packagegui> \ No newline at end of file