Fix EmailField type and add "if helpers.exists ..." to squid.conf

This commit is contained in:
Frédéric LIETART (TheLinuxFr) 2016-03-21 11:57:03 +01:00
parent 3bcaaa9b13
commit 98b3b2b2f6
2 changed files with 7 additions and 3 deletions

View File

@ -69,12 +69,12 @@
<default>0</default>
<Required>N</Required>
</suppressVersion>
<VisibleEmail type="TextField">
<default>localhost</default>
<VisibleEmail type="EmailField">
<default>admin@localhost</default>
<Required>N</Required>
</VisibleEmail>
<VisibleHostname type="TextField">
<default>admin@localhost</default>
<default>localhost</default>
<Required>N</Required>
</VisibleHostname>
<cache>

View File

@ -523,7 +523,11 @@ delay_parameters 1 {{OPNsense.proxy.general.traffic.OverallBandwidthTrotteling|i
{% endif %}
# Disable squid logfile rotate to use system defaults
logfile_rotate 0
{% if helpers.exists('OPNsense.proxy.general.VisibleHostname') %}
# Define visible hostname
visible_hostname {{OPNsense.proxy.general.VisibleHostname}}
{% endif %}
{% if helpers.exists('OPNsense.proxy.general.VisibleEmail') %}
# Define visible email
cache_mgr {{OPNsense.proxy.general.VisibleEmail}}
{% endif %}