diff options
| -rw-r--r-- | .github/workflows/mirror-pr-and-sync.yml | 5 | ||||
| -rw-r--r-- | data/templates/conserver/dropbear@.service.j2 | 2 | ||||
| -rwxr-xr-x | src/conf_mode/service_console-server.py | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml index 48a67a43f..120e116d4 100644 --- a/.github/workflows/mirror-pr-and-sync.yml +++ b/.github/workflows/mirror-pr-and-sync.yml @@ -2,10 +2,6 @@ name: Create Mirror PR and Repo Sync on: workflow_dispatch: inputs: - pr_number: - description: 'Source repo PR Number' - required: true - type: string sync_branch: description: 'branch to sync' required: true @@ -20,7 +16,6 @@ jobs: if: github.repository_owner != 'vyos' uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main with: - pr_number: ${{ inputs.pr_number }} sync_branch: ${{ inputs.sync_branch }} secrets: PAT: ${{ secrets.PAT }} diff --git a/data/templates/conserver/dropbear@.service.j2 b/data/templates/conserver/dropbear@.service.j2 index e355dab43..c6c31f98f 100644 --- a/data/templates/conserver/dropbear@.service.j2 +++ b/data/templates/conserver/dropbear@.service.j2 @@ -1,4 +1,4 @@ [Service] ExecStart= -ExecStart=/usr/sbin/dropbear -w -j -k -r /etc/dropbear/dropbear_rsa_host_key -b /etc/issue.net -c "/usr/bin/console {{ device }}" -P /run/conserver/dropbear.%I.pid -p %I +ExecStart=/usr/sbin/dropbear -w -j -k -r /etc/dropbear/dropbear_rsa_host_key -r /etc/dropbear/dropbear_ecdsa_host_key -b /etc/issue.net -c "/usr/bin/console {{ device }}" -P /run/conserver/dropbear.%I.pid -p %I PIDFile=/run/conserver/dropbear.%I.pid diff --git a/src/conf_mode/service_console-server.py b/src/conf_mode/service_console-server.py index b112add3f..b83c6dfb1 100755 --- a/src/conf_mode/service_console-server.py +++ b/src/conf_mode/service_console-server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2021 VyOS maintainers and contributors +# Copyright (C) 2018-2025 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -98,6 +98,12 @@ def generate(proxy): return None def apply(proxy): + if not os.path.exists('/etc/dropbear/dropbear_rsa_host_key'): + call('dropbearkey -t rsa -s 4096 -f /etc/dropbear/dropbear_rsa_host_key') + + if not os.path.exists('/etc/dropbear/dropbear_ecdsa_host_key'): + call('dropbearkey -t ecdsa -f /etc/dropbear/dropbear_ecdsa_host_key') + call('systemctl daemon-reload') call('systemctl stop dropbear@*.service conserver-server.service') |