diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-18 23:09:58 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-18 23:09:58 +0200 |
| commit | b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9 (patch) | |
| tree | 0aec1b3bed8f4f38d187617efb525d40f64f59ff | |
| parent | e59da2923cbbb21258cc9769b6a152d6af78abe6 (diff) | |
| download | vyos-1x-b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9.tar.gz vyos-1x-b509bbf0c0bf33f39e67f0aa8df481ef15d6bae9.zip | |
console-server: T2490: rename CLI to console-server
| -rw-r--r-- | data/templates/conserver/conserver.conf.tmpl | 2 | ||||
| -rw-r--r-- | interface-definitions/service_console-server.xml.in (renamed from interface-definitions/service_serial-proxy.xml.in) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/connect-disconnect.xml | 6 | ||||
| -rwxr-xr-x | src/conf_mode/service_console-server.py (renamed from src/conf_mode/service_serial-proxy.py) | 2 | ||||
| -rw-r--r-- | src/systemd/dropbear@.service | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/data/templates/conserver/conserver.conf.tmpl b/data/templates/conserver/conserver.conf.tmpl index 329a9b4ae..5fffaf31e 100644 --- a/data/templates/conserver/conserver.conf.tmpl +++ b/data/templates/conserver/conserver.conf.tmpl @@ -1,4 +1,4 @@ -### Autogenerated by service_serial-proxy.py ### +### Autogenerated by service_console-server.py ### # See https://www.conserver.com/docs/conserver.cf.man.html for additional options diff --git a/interface-definitions/service_serial-proxy.xml.in b/interface-definitions/service_console-server.xml.in index 917af0122..679ea32a2 100644 --- a/interface-definitions/service_serial-proxy.xml.in +++ b/interface-definitions/service_console-server.xml.in @@ -2,9 +2,9 @@ <interfaceDefinition> <node name="service"> <children> - <node name="serial-proxy" owner="${vyos_conf_scripts_dir}/service_serial-proxy.py"> + <node name="console-server" owner="${vyos_conf_scripts_dir}/service_console-server.py"> <properties> - <help>Serial to Network</help> + <help>Serial Console Server</help> </properties> <children> <tagNode name="device"> diff --git a/op-mode-definitions/connect-disconnect.xml b/op-mode-definitions/connect-disconnect.xml index a394e9b91..69afe6db0 100644 --- a/op-mode-definitions/connect-disconnect.xml +++ b/op-mode-definitions/connect-disconnect.xml @@ -15,11 +15,11 @@ </properties> <command>sudo ${vyos_op_scripts_dir}/connect_disconnect.py --connect "$3"</command> </tagNode> - <tagNode name="serial-proxy"> + <tagNode name="console-server"> <properties> - <help>Connect to serial proxy port</help> + <help>Connect to port of serial console server</help> <completionHelp> - <path>service serial-proxy device</path> + <path>service console-server device</path> </completionHelp> </properties> <command>/usr/bin/console "$3"</command> diff --git a/src/conf_mode/service_serial-proxy.py b/src/conf_mode/service_console-server.py index 5f510d311..087b13c04 100755 --- a/src/conf_mode/service_serial-proxy.py +++ b/src/conf_mode/service_console-server.py @@ -35,7 +35,7 @@ default_values = { def get_config(): conf = Config() - base = ['service', 'serial-proxy'] + base = ['service', 'console-server'] if not conf.exists(base): return None diff --git a/src/systemd/dropbear@.service b/src/systemd/dropbear@.service index a4df6ad41..a7057ffe1 100644 --- a/src/systemd/dropbear@.service +++ b/src/systemd/dropbear@.service @@ -7,7 +7,7 @@ After=dropbearkey.service vyos-router.service conserver-server.service [Service] Type=forking -ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-shell-api returnValue service serial-proxy device "%I" ssh port)' +ExecStartPre=/usr/bin/bash -c '/usr/bin/systemctl set-environment PORT=$(cli-shell-api returnValue service console-server device "%I" ssh port)' ExecStart=-/usr/sbin/dropbear -w -j -k -r /etc/dropbear/dropbear_rsa_host_key -c "/usr/bin/console %I" -P /run/conserver/dropbear.%I.pid -p ${PORT} PIDFile=/run/conserver/dropbear.%I.pid KillMode=process |