Skip to content

Commit 4354107

Browse files
committed
fix
1 parent 7e0e60a commit 4354107

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

components/server/src/config.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ export interface ConfigSerialized {
260260
*/
261261
patSigningKeyFile?: string;
262262

263-
auth: AuthPKIConfig;
263+
auth: {
264+
pki: AuthPKIConfig;
265+
};
264266
}
265267

266268
export interface AuthPKIConfig {
@@ -375,8 +377,8 @@ export namespace ConfigFile {
375377

376378
const authPKI: Config["auth"]["pki"] = {
377379
signing: {
378-
privateKey: fs.readFileSync(filePathTelepresenceAware(config.auth.signing.privateKeyPath), "utf-8"),
379-
publicKey: fs.readFileSync(filePathTelepresenceAware(config.auth.signing.publicKeyPath), "utf-8"),
380+
privateKey: fs.readFileSync(filePathTelepresenceAware(config.auth.pki.signing.privateKeyPath), "utf-8"),
381+
publicKey: fs.readFileSync(filePathTelepresenceAware(config.auth.pki.signing.publicKeyPath), "utf-8"),
380382
},
381383
validating: [],
382384
};

install/installer/pkg/components/server/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ type AuthPKIConfig struct {
7575
Signing KeyPair `json:"signing"`
7676

7777
// Validating KeyPairs are used for checking validity only
78-
Validating []KeyPair `json:"validating"`
78+
Validating []KeyPair `json:"validating,omitempty"`
7979
}
8080

8181
type KeyPair struct {

0 commit comments

Comments
 (0)