Merge branch 'master' of github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2025-12-28 08:02:42 -08:00
2 changed files with 4 additions and 0 deletions

View File

@@ -24,3 +24,4 @@ jobs:
DEV_UPLOAD_SSH_DIR: ${{ secrets.DEV_UPLOAD_SSH_DIR }}
PRERELEASE_UPLOAD_SSH_DIR: ${{ secrets.PRERELEASE_UPLOAD_SSH_DIR }}
DEV_SSH_PRV_KEY: ${{ secrets.DEV_SSH_PRV_KEY }}
ALL_GPG_PH2: ${{ secrets.ALL_GPG_PH2 }}

View File

@@ -26,6 +26,9 @@ if ($config{'sync_create'} && &has_command($config{'keygen_path'}) &&
if (-r "$uinfo->{'home'}/.ssh/identity.pub") {
&copy_source_dest("$uinfo->{'home'}/.ssh/identity.pub", $akeys);
}
elsif (-r "$uinfo->{'home'}/.ssh/id_ed25519.pub") {
&copy_source_dest("$uinfo->{'home'}/.ssh/id_ed25519.pub", $akeys);
}
elsif (-r "$uinfo->{'home'}/.ssh/id_rsa.pub") {
&copy_source_dest("$uinfo->{'home'}/.ssh/id_rsa.pub", $akeys);
}