Updates

fetch-secrets.sh

@@ -18,9 +18,12 @@ cp secrets/$1/[email protected] files/secrets/
 # and private key + ca certificate signature
 cp secrets/$1/icpcadmin@contestmanager{,-cert.pub} files/secrets/
 
-# copy public+private host key (and ca certificate signature)
+# copy public+private host key for the contestant machines (and ca certificate signature)
 cp secrets/$1/contestant.icpcnet.internal_host_ed25519_key{,.pub,-cert.pub} files/secrets/
 
+# copy public+private host key for the management machine (and ca certificate signature)
+cp secrets/$1/contestmanager.icpcnet.internal_host_ed25519_key{,.pub,-cert.pub} files/secrets/
+
 # copy public ca
 cp secrets/$1/server_ca.pub files/secrets/
 echo "done!"

files/scripts/pcpr

@@ -59,7 +59,12 @@ macAddress = subprocess.getoutput("cat /sys/class/net/" + netDevice + "/address"
 hostname = subprocess.getoutput("hostname")
 
 # -MLetter we assume US printers and generate letter size pages and not A4 pages
-options = "-MLetter -2 --landscape --pretty-print "
+options = [
+ "-MLetter",
+ "-2",
+ "--landscape",
+ "--pretty-print"
+]
 
 # The header is too wide, but footers are a pain
 header = "$n; page $% of $=; time=$C; user=$(USER); site=" + site + "; team=" + team + "; host=" + hostname + "; mac=" + macAddress
@@ -68,6 +73,6 @@ header = "$n; page $% of $=; team=" + team
 
 # Though I encourage just one argument (the name of one file);
 # all command line arguments are tacked on at the end
-os.system("/usr/bin/enscript " + options + " '--header=" + header + "' " + ' '.join(sys.argv[1:]))
+os.system("/usr/bin/enscript", **options, f'--header={header}', **sys.argv[1:])
 
 # PS. Using footers would be nice, but that would require writing enscript *.hdr files.