diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-13 08:06:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-13 08:06:18 +0100 |
| commit | 31c03bef52a01591b16a6bc71286dbd13e2bd6f4 (patch) | |
| tree | 89e3dcda6e477d9ee3e152946fba9e0e5e7d6943 | |
| parent | 344ecd468ff935661159849064bd60657235f00f (diff) | |
| parent | 375dc0c9b5da7f51a1b7e89a965affab8266ba04 (diff) | |
| download | vyos-1x-31c03bef52a01591b16a6bc71286dbd13e2bd6f4.tar.gz vyos-1x-31c03bef52a01591b16a6bc71286dbd13e2bd6f4.zip | |
Merge pull request #2816 from c-po/equuleus-migration-T5924
wireguard: T5924: harden migration script logic 22-to-23
| -rw-r--r-- | .github/labeler.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/pull-request-labels.yml | 20 | ||||
| -rwxr-xr-x | src/migration-scripts/interfaces/22-to-23 | 8 |
3 files changed, 37 insertions, 3 deletions
diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000..e0b9ee430 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,12 @@ +equuleus: + - any: + - base-branch: 'equuleus' +current: + - any: + - base-branch: 'current' +crux: + - any: + - base-branch: 'crux' +sagitta: + - any: + - base-branch: 'sagitta' diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml new file mode 100644 index 000000000..778daae30 --- /dev/null +++ b/.github/workflows/pull-request-labels.yml @@ -0,0 +1,20 @@ +--- +name: Add pull request labels + +on: + pull_request_target: + branches: + - current + - crux + - equuleus + - sagitta + +jobs: + add-pr-label: + name: Add PR Labels + runs-on: ubuntu-20.04 + permissions: + contents: read + pull-requests: write + steps: + - uses: actions/labeler@v5.0.0-alpha.1 diff --git a/src/migration-scripts/interfaces/22-to-23 b/src/migration-scripts/interfaces/22-to-23 index c3c4ea366..a66bd303b 100755 --- a/src/migration-scripts/interfaces/22-to-23 +++ b/src/migration-scripts/interfaces/22-to-23 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2023 VyOS maintainers and contributors +# Copyright (C) 2024 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 @@ -33,9 +33,11 @@ if __name__ == '__main__': if not config.exists(base): # Nothing to do sys.exit(0) + for interface in config.list_nodes(base): - private_key_name = config.return_value( - base + [interface, 'private-key']) + private_key_name = 'default' + if config.exists(base + [interface, 'private-key']): + private_key_name = config.return_value(base + [interface, 'private-key']) private_key_path = f'/config/auth/wireguard/{private_key_name}/private.key' with open(private_key_path, 'r') as file: private_key = file.read().rstrip() |