diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-04-09 21:20:29 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2020-04-09 21:20:29 +0200 |
commit | 28454f9613f41a1e70b60eec20930c2232e2d9c9 (patch) | |
tree | 778fe4df0cffeed7513e33c5cbd0c438b8236fdd /src/conf_mode/interfaces-pppoe.py | |
parent | 9875a21bdb26df19f2faf3e81153dea15e4f9e3c (diff) | |
parent | 316483cbe18811c6eaea07d5b790094a5de45abe (diff) | |
download | vyos-1x-28454f9613f41a1e70b60eec20930c2232e2d9c9.tar.gz vyos-1x-28454f9613f41a1e70b60eec20930c2232e2d9c9.zip |
Merge branch 'vxlan' of github.com:c-po/vyos-1x into current
* 'vxlan' of github.com:c-po/vyos-1x:
vxlan: pseudo-ethernet: T2260: convert link nodes to source-interface
wireguard: T2206: fix comment in migration script
pppoe: enable Jinja2 trim_blocks
Diffstat (limited to 'src/conf_mode/interfaces-pppoe.py')
-rwxr-xr-x | src/conf_mode/interfaces-pppoe.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-pppoe.py b/src/conf_mode/interfaces-pppoe.py index 26441838e..5f073dac6 100755 --- a/src/conf_mode/interfaces-pppoe.py +++ b/src/conf_mode/interfaces-pppoe.py @@ -161,7 +161,7 @@ def generate(pppoe): # Prepare Jinja2 template loader from files tmpl_path = os.path.join(vyos_data_dir["data"], "templates", "pppoe") fs_loader = FileSystemLoader(tmpl_path) - env = Environment(loader=fs_loader) + env = Environment(loader=fs_loader, trim_blocks=True) # set up configuration file path variables where our templates will be # rendered into |