diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-05-01 18:40:57 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-05-01 18:40:57 +0200 |
| commit | 827cefbcbfa22b42c8f144a41d6a2d3825268755 (patch) | |
| tree | f0ee668ab4d32298680b901ff8b55fdb1450f019 | |
| parent | a30209ae0be3d0f1df37a30dbe73d10d3f3ec8cb (diff) | |
| download | vyos-1x-827cefbcbfa22b42c8f144a41d6a2d3825268755.tar.gz vyos-1x-827cefbcbfa22b42c8f144a41d6a2d3825268755.zip | |
conserver: T4353: fix Jinja2 linting errors
| -rw-r--r-- | data/templates/conserver/conserver.conf.j2 (renamed from data/templates/conserver/conserver.conf.tmpl) | 2 | ||||
| -rw-r--r-- | data/templates/conserver/dropbear@.service.j2 (renamed from data/templates/conserver/dropbear@.service.tmpl) | 0 | ||||
| -rwxr-xr-x | src/conf_mode/service_console-server.py | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/conserver/conserver.conf.tmpl b/data/templates/conserver/conserver.conf.j2 index 4e7b5d8d7..1823657d7 100644 --- a/data/templates/conserver/conserver.conf.tmpl +++ b/data/templates/conserver/conserver.conf.j2 @@ -17,7 +17,7 @@ default * { ## {% for key, value in device.items() %} {# Depending on our USB serial console we could require a path adjustment #} -{% set path = '/dev' if key.startswith('ttyS') else '/dev/serial/by-bus' %} +{% set path = '/dev' if key.startswith('ttyS') else '/dev/serial/by-bus' %} console {{ key }} { master localhost; type device; diff --git a/data/templates/conserver/dropbear@.service.tmpl b/data/templates/conserver/dropbear@.service.j2 index e355dab43..e355dab43 100644 --- a/data/templates/conserver/dropbear@.service.tmpl +++ b/data/templates/conserver/dropbear@.service.j2 diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py index 51050e702..a2e411e49 100755 --- a/src/conf_mode/service_console-server.py +++ b/src/conf_mode/service_console-server.py @@ -81,7 +81,7 @@ def generate(proxy): if not proxy: return None - render(config_file, 'conserver/conserver.conf.tmpl', proxy) + render(config_file, 'conserver/conserver.conf.j2', proxy) if 'device' in proxy: for device, device_config in proxy['device'].items(): if 'ssh' not in device_config: @@ -92,7 +92,7 @@ def generate(proxy): 'port' : device_config['ssh']['port'], } render(dropbear_systemd_file.format(**tmp), - 'conserver/dropbear@.service.tmpl', tmp) + 'conserver/dropbear@.service.j2', tmp) return None |