Merge branch 'console-server' of github.com:c-po/vyos-1x into current

* 'console-server' of github.com:c-po/vyos-1x:
  console-server: T2490: set service priority to 990
  op-mode: console-server: T2490: rename "connect console-server" to "connect console"
  console-server: T2490: server must listen only on localhost
  op-mode: add "show ip ports" to list local opened ports
  console-server: T2490: add SSH support for direct device access
  op-mode: console-server: T2490: get connection info
  console-server: T2490: remove superfluous "port" node from XML definition
  console-server: T2490: rename CLI to console-server
  console-server: T2490: add SSH support
  console-server: T2490: log to journald
  console-server: T2490: move CLI parsing to get_config_dict()
  console-server: T2490: replace ser2net with conserver
  op-mode: T2490: add "connect serial-proxy" CLI command
  console-server: T2490: add default CLI values
  console-server: T2490: rename CLI to "serial-proxy"
  console-server: T2490: use new USB ports "by-bus"
  console-server: T2490: use "ls" for completion helper
  console-server: T2490: initial support

1 files changed, 37 insertions, 0 deletions

diff --git a/data/templates/conserver/conserver.conf.tmpl b/data/templates/conserver/conserver.conf.tmpl
new file mode 100644
index 000000000..4e7b5d8d7
--- /dev/null
+++ b/data/templates/conserver/conserver.conf.tmpl
@@ -0,0 +1,37 @@
+### Autogenerated by service_console-server.py ###
+
+# See https://www.conserver.com/docs/conserver.cf.man.html for additional options
+
+config * {
+    primaryport 3109;
+    daemonmode false;
+}
+
+default * {
+    motd "VyOS Console Server";
+    rw *;
+}
+
+##
+## list of consoles we serve
+##
+{% 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' %}
+console {{ key }} {
+    master localhost;
+    type device;
+    device {{ path }}/{{ key }};
+    baud {{ value.speed }};
+    parity {{ value.parity }};
+    options {{ "!" if value.stop_bits == "1" }}cstopb;
+}
+{% endfor %}
+
+##
+## list of clients we allow
+##
+access * {
+    trusted localhost;
+    allowed localhost;
+}