|
@@ -207,12 +207,12 @@ type OperClassConfig struct {
|
207
|
207
|
|
208
|
208
|
// OperConfig defines a specific operator's configuration.
|
209
|
209
|
type OperConfig struct {
|
210
|
|
- Class string
|
211
|
|
- Vhost string
|
212
|
|
- WhoisLine string `yaml:"whois-line"`
|
213
|
|
- Password string
|
214
|
|
- Certfp string
|
215
|
|
- Modes string
|
|
210
|
+ Class string
|
|
211
|
+ Vhost string
|
|
212
|
+ WhoisLine string `yaml:"whois-line"`
|
|
213
|
+ Password string
|
|
214
|
+ Fingerprint string
|
|
215
|
+ Modes string
|
216
|
216
|
}
|
217
|
217
|
|
218
|
218
|
// LineLenConfig controls line lengths.
|
|
@@ -455,13 +455,13 @@ func (conf *Config) OperatorClasses() (map[string]*OperClass, error) {
|
455
|
455
|
|
456
|
456
|
// Oper represents a single assembled operator's config.
|
457
|
457
|
type Oper struct {
|
458
|
|
- Name string
|
459
|
|
- Class *OperClass
|
460
|
|
- WhoisLine string
|
461
|
|
- Vhost string
|
462
|
|
- Pass []byte
|
463
|
|
- Certfp string
|
464
|
|
- Modes []modes.ModeChange
|
|
458
|
+ Name string
|
|
459
|
+ Class *OperClass
|
|
460
|
+ WhoisLine string
|
|
461
|
+ Vhost string
|
|
462
|
+ Pass []byte
|
|
463
|
+ Fingerprint string
|
|
464
|
+ Modes []modes.ModeChange
|
465
|
465
|
}
|
466
|
466
|
|
467
|
467
|
// Operators returns a map of operator configs from the given OperClass and config.
|
|
@@ -481,7 +481,7 @@ func (conf *Config) Operators(oc map[string]*OperClass) (map[string]*Oper, error
|
481
|
481
|
if err != nil {
|
482
|
482
|
return nil, err
|
483
|
483
|
}
|
484
|
|
- oper.Certfp = opConf.Certfp
|
|
484
|
+ oper.Fingerprint = opConf.Fingerprint
|
485
|
485
|
|
486
|
486
|
oper.Vhost = opConf.Vhost
|
487
|
487
|
class, exists := oc[opConf.Class]
|