diff options
| -rw-r--r-- | data/templates/squid/squid.conf.tmpl | 2 | ||||
| -rwxr-xr-x | src/conf_mode/system-login-banner.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/data/templates/squid/squid.conf.tmpl b/data/templates/squid/squid.conf.tmpl index 80826fc75..26aff90bf 100644 --- a/data/templates/squid/squid.conf.tmpl +++ b/data/templates/squid/squid.conf.tmpl @@ -88,7 +88,7 @@ tcp_outgoing_address {{ outgoing_address }} {% if listen_address is defined and listen_address is not none %} {% for address, config in listen_address.items() %} -http_port {{ address }}:{{ config.port if config.port is defined else default_port }} {{ 'intercept' if config.disable_transparent is not defined }} +http_port {{ address | bracketize_ipv6 }}:{{ config.port if config.port is defined else default_port }} {{ 'intercept' if config.disable_transparent is not defined }} {% endfor %} {% endif %} http_port 127.0.0.1:{{ default_port }} diff --git a/src/conf_mode/system-login-banner.py b/src/conf_mode/system-login-banner.py index 84ff08ebf..a521c9834 100755 --- a/src/conf_mode/system-login-banner.py +++ b/src/conf_mode/system-login-banner.py @@ -15,6 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from sys import exit +from copy import deepcopy from vyos.config import Config from vyos.util import write_file @@ -40,7 +41,7 @@ default_config_data = { } def get_config(config=None): - banner = default_config_data + banner = deepcopy(default_config_data) if config: conf = config else: |