Merge pull request #1085 from doktornotor/patch-1

1 files changed, 31 insertions, 11 deletions

diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml
index dda924f8..0f86bf84 100644
--- a/config/squid3/34/squid.xml
+++ b/config/squid3/34/squid.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>squid</name>
-	<version>0.3.7</version>
+	<version>0.3.8</version>
 	<title>Proxy Server: General Settings</title>
 	<include_file>/usr/local/pkg/squid.inc</include_file>
 	<menu>
@@ -65,7 +65,7 @@
 	</service>
 	<service>
 		<name>clamd</name>
-		<rcfile>clamav-clamd</rcfile>
+		<rcfile>clamd.sh</rcfile>
 		<executable>clamd</executable>
 		<description>ClamAV Antivirus</description>
 	</service>
@@ -155,10 +155,6 @@
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<item>https://packages.pfsense.org/packages/config/squid3/34/squid_reverse.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
 		<item>https://packages.pfsense.org/packages/config/squid3/34/squid_reverse_general.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
@@ -237,6 +233,29 @@
 			<type>listtopic</type>
 		</field>
 		<field>
+			<fielddescr>Enable Squid Proxy</fielddescr>
+			<fieldname>enable_squid</fieldname>
+			<description>
+				<![CDATA[
+				Check to enable the Squid proxy.<br/>
+				Note: If unchecked, <strong>all</strong> Squid services will be disabled and stopped.<br/>
+				]]>
+			</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Keep Settings/Data</fielddescr>
+			<fieldname>keep_squid_data</fieldname>
+			<description>
+				<![CDATA[
+				If enabled, the settings, logs, cache, AV defs and other data will be preserved across package reinstalls.<br/>
+				<strong><span class="errmsg">Note:</span> If disabled, all settings and data will be wiped on package uninstall/reinstall/upgrade.</strong>
+				]]>
+			</description>
+			<type>checkbox</type>
+			<default_value>on</default_value>
+		</field>
+		<field>
 			<fielddescr>Proxy Interface(s)</fielddescr>
 			<fieldname>active_interface</fieldname>
 			<description>
@@ -496,23 +515,23 @@
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Enable Logging</fielddescr>
+			<fielddescr>Enable Access Logging</fielddescr>
 			<fieldname>log_enabled</fieldname>
 			<description>
 				<![CDATA[
-				This will enable the access log.
+				This will enable the <strong>access</strong> log.
 				<strong>Warning:</strong> Do not switch this on if you don't have much disk space left.
 				]]>
 			</description>
 			<type>checkbox</type>
-			<enablefields>log_dir,log_rotate</enablefields>
+			<enablefields>log_rotate</enablefields>
 		</field>
 		<field>
 			<fielddescr>Log Store Directory</fielddescr>
 			<fieldname>log_dir</fieldname>
 			<description>
 				<![CDATA[
-				The directory where the log will be stored.<br/>
+				The directory where the logs will be stored. This is also used for logs other than the Access Log above.<br/>
 				Default: /var/squid/logs<br/>
 				<strong>Note: Do NOT include the trailing / when setting a custom location.</strong>
 				]]>
@@ -725,10 +744,11 @@
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
 	<![CDATA[
-		update_output_window("This operation may take quite some time, please be patient. Do not press stop or attempt to navigate away from this page during this process.");
 		squid_install_command();
 		unlink_if_exists("/usr/local/etc/rc.d/squid");
 		unlink_if_exists("/usr/local/etc/rc.d/c-icap");
+		unlink_if_exists("/usr/local/etc/rc.d/clamav-clamd");
+		unlink_if_exists("/usr/local/etc/rc.d/clamav-freshclam");
 	]]>
 	</custom_php_install_command>
 	<custom_php_deinstall_command>