From f96b4ce6cad03682cd507600e72b2db4c492d844 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 18 Sep 2017 21:01:51 +0200
Subject: [PATCH] C-ICAP: Allow disabling access.log (#274)

---
 .../mvc/app/controllers/OPNsense/CICAP/forms/general.xml    | 6 ++++++
 .../src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml  | 6 +++++-
 .../opnsense/service/templates/OPNsense/CICAP/c-icap.conf   | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/general.xml b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/general.xml
index 36dbf211a..a2f96e5a3 100644
--- a/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/general.xml
+++ b/www/c-icap/src/opnsense/mvc/app/controllers/OPNsense/CICAP/forms/general.xml
@@ -77,4 +77,10 @@
         <type>text</type>
         <help>A name for this server. Used when displaying information about this server (logs, info service, etc).</help>
     </field>
+    <field>
+        <id>general.enable_accesslog</id>
+        <label>Enable access logging</label>
+        <type>checkbox</type>
+        <help>This will enable logging of access log.</help>
+    </field>
 </form>
diff --git a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
index dd9d55e00..953773ddb 100644
--- a/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
+++ b/www/c-icap/src/opnsense/mvc/app/models/OPNsense/CICAP/General.xml
@@ -58,5 +58,9 @@
             <default></default>
             <Required>N</Required>
         </servername>
-	</items>
+        <enable_accesslog type="BooleanField">
+            <default>1</default>
+            <Required>Y</Required>
+        </enable_accesslog>	    
+    </items>
 </model>
diff --git a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
index 463488f40..25398ac6c 100644
--- a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
+++ b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c-icap.conf
@@ -55,7 +55,9 @@ RemoteProxyUsers off
 RemoteProxyUserHeader X-Authenticated-User
 RemoteProxyUserHeaderEncoded on
 ServerLog /var/log/c-icap/server.log
+{% if helpers.exists('OPNsense.cicap.general.enable_accesslog') and OPNsense.cicap.general.enable_accesslog == '1' %}
 AccessLog /var/log/c-icap/access.log
+{% endif %}
 Service echo srv_echo.so
 Include virus_scan.conf