Changeset 34518 for other-projects

Timestamp:

2020-10-29T13:36:46+13:00 (3 years ago)

Author:

Jeremy Symon

Message:

use a different identity file for www-internal - needs to be ed25519, not rsa.

File:

• other-projects/nightly-tasks/snapshot/trunk/task.pl (modified) (2 diffs)

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -108 +108 @@
     (my $id3re = $id3) =~ s@\.@\\.@g;
 
+    print STDERR "SNAPSHOT ID: $id3\n"; 
+    print STDERR "SNAPSHOT ID RE: $id3re\n";
+    
     $ENV{'munges'} = "s/-$id2re/-$id2-candidate-" . get_date() . "$osversion" . "/g " if ($id2 =~ m/\S/);
     $ENV{'munges'} .= "s/-$id3re/-$id3-candidate-" . get_date() . "$osversion". "/g" if ($id3 =~ m/\S/);
@@ -156 +159 @@
 $ENV{'IDENTITY_FILE'} =
     "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
+#use the  correct key for uploading - ed25519 for www-internal
+$ENV{'IDENTITY_FILE_ED25519'} =
+    "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} ."-ed25519". ($^O eq "MSWin32" ? ".ppk" : "");