bootstrapconfig: add SignerPublicKey and lots of omitempty

This commit is contained in:
Mikaël Cluseau
2025-07-06 11:23:53 +02:00
parent 554aaf0a89
commit d857af8032

View File

@ -3,8 +3,8 @@ package bootstrapconfig
type Config struct { type Config struct {
AntiPhishingCode string `yaml:"anti_phishing_code"` AntiPhishingCode string `yaml:"anti_phishing_code"`
Keymap string Keymap string `yaml:",omitempty"`
Modules string Modules string `yaml:",omitempty"`
Auths []Auth Auths []Auth
@ -18,27 +18,29 @@ type Config struct {
Script string Script string
} }
SSH struct { SignerPublicKey string `yaml:"signer_public_key,omitempty"`
Listen string
UserCA string `yaml:"user_ca"` SSH *struct {
Listen string `yaml:",omitempty"`
UserCA string `yaml:"user_ca,omitempty"`
Keys struct { Keys struct {
DSA string DSA string `yaml:",omitempty"`
RSA string RSA string `yaml:",omitempty"`
ECDSA string ECDSA string `yaml:",omitempty"`
ED25519 string ED25519 string `yaml:",omitempty"`
} }
} } `yaml:",omitempty"`
PreLVMCrypt []CryptDev `yaml:"pre_lvm_crypt"` PreLVMCrypt []CryptDev `yaml:"pre_lvm_crypt"`
LVM []LvmVG LVM []LvmVG
Crypt []CryptDev Crypt []CryptDev
Bootstrap Bootstrap Bootstrap *Bootstrap `yaml:",omitempty"`
} }
type Auth struct { type Auth struct {
Name string Name string
SSHKey string `yaml:"sshKey"` SSHKey string `yaml:"sshKey,omitempty"`
Password string `yaml:"password"` Password string `yaml:"password,omitempty"`
} }
type LvmVG struct { type LvmVG struct {
@ -55,25 +57,25 @@ type LvmVG struct {
LVs []struct { LVs []struct {
Name string Name string
FS string FS string `yaml:",omitempty"`
Raid *RaidConfig Raid *RaidConfig `yaml:",omitempty"`
Size string Size string `yaml:",omitempty"`
Extents string Extents string `yaml:",omitempty"`
} }
} }
type CryptDev struct { type CryptDev struct {
Dev string Dev string `yaml:",omitempty"`
Prefix string Prefix string `yaml:",omitempty"`
Name string Name string
} }
type RaidConfig struct { type RaidConfig struct {
Mirrors int Mirrors int `yaml:",omitempty"`
Stripes int Stripes int `yaml:",omitempty"`
} }
type Bootstrap struct { type Bootstrap struct {
Dev string Dev string `yaml:",omitempty"`
Seed string Seed string `yaml:",omitempty"`
} }