From 6c2e1467df49e8be3bd6ba3de9dc43f19ab0ad57 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 1 Feb 2016 14:08:41 +0100 Subject: [PATCH] (proxy) fix template errors when nothing is configured --- src/opnsense/service/templates/OPNsense/Proxy/newsyslog.conf | 2 +- src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d | 2 +- src/opnsense/service/templates/OPNsense/Proxy/squid.conf | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/opnsense/service/templates/OPNsense/Proxy/newsyslog.conf b/src/opnsense/service/templates/OPNsense/Proxy/newsyslog.conf index a9fb705dd..db392ab30 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/newsyslog.conf +++ b/src/opnsense/service/templates/OPNsense/Proxy/newsyslog.conf @@ -1,5 +1,5 @@ # logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] -{% if OPNsense.proxy.general.enabled|default("0") == "1" %} +{% if helpers.exists('OPNsense.proxy.general.enabled') and OPNsense.proxy.general.enabled|default("0") == "1" %} /var/log/squid/access.log squid:squid 644 14 * @T00 ZB /var/run/squid/squid.pid 30 /var/log/squid/cache.log squid:squid 644 2 * @T00 ZB /var/run/squid/squid.pid 30 /var/log/squid/store.log squid:squid 644 2 * @T00 ZB /var/run/squid/squid.pid 30 diff --git a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d index cd2497c11..079fa7df6 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d +++ b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d @@ -1,3 +1,3 @@ -squid_enable={% if OPNsense.proxy.general.enabled|default("0") == "1" %}YES{% else %}NO{% endif %} +squid_enable={% if helpers.exists('OPNsense.proxy.general.enabled') and OPNsense.proxy.general.enabled|default("0") == "1" %}YES{% else %}NO{% endif %} squid_opnsense_bootup_run="/usr/local/opnsense/scripts/proxy/setup.sh" diff --git a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf index 3b62802a0..4fa07d990 100644 --- a/src/opnsense/service/templates/OPNsense/Proxy/squid.conf +++ b/src/opnsense/service/templates/OPNsense/Proxy/squid.conf @@ -3,7 +3,7 @@ # Do not edit this file manually. # setup listen configuration -{%if OPNsense.proxy.forward.transparentMode == '1' %} +{% if helpers.exists('OPNsense.proxy.forward.transparentMode') and OPNsense.proxy.forward.transparentMode == '1' %} # transparant mode, listen on localhost http_port 127.0.0.1:{{ OPNsense.proxy.forward.port }} intercept {% endif %} @@ -276,7 +276,9 @@ cache_dir ufs {{OPNsense.proxy.general.cache.local.directory}} {{OPNsense.proxy. {% endif %} {% endif %} +{% if helpers.exists('OPNsense.proxy.general.cache.local') %} cache_mem {{ OPNsense.proxy.general.cache.local.cache_mem|default('256') }} MB +{% endif %} # Leave coredumps in the first cache dir coredump_dir /var/squid/cache