diff --git a/tesseract/genconf/env.go b/tesseract/genconf/env.go index 9e21921..1253d12 100644 --- a/tesseract/genconf/env.go +++ b/tesseract/genconf/env.go @@ -32,7 +32,7 @@ func generateEnv(yamlFile string) { // Build TESSERACT_ARGS string args := []string{ fmt.Sprintf("--private_key=%s", logEntry.Secret), - fmt.Sprintf("--origin=%s.log.ct.ipng.ch", logEntry.ShortName), + fmt.Sprintf("--origin=%s.%s", logEntry.ShortName, logEntry.Domain), fmt.Sprintf("--storage_dir=%s", logEntry.LocalDirectory), fmt.Sprintf("--roots_pem_file=%s", rootsPemPath), } diff --git a/tesseract/genconf/html.go b/tesseract/genconf/html.go index 4426629..acfe384 100644 --- a/tesseract/genconf/html.go +++ b/tesseract/genconf/html.go @@ -74,7 +74,7 @@ const htmlTemplate = ` {{range .Logs}} -

{{.ShortName}}.log.ct.ipng.ch

+

{{.ShortName}}.{{.Domain}}

Log ID: {{.LogID}}
@@ -211,7 +211,7 @@ func computeKeyInfo(logEntry *Log) error { func generateLogJSONWithStatus(logEntry Log, outputPath string) error { logJSON := LogV3JSON{ - Description: fmt.Sprintf("%s.log.ct.ipng.ch", logEntry.ShortName), + Description: fmt.Sprintf("%s.%s", logEntry.ShortName, logEntry.Domain), SubmissionURL: fmt.Sprintf("%s/", logEntry.SubmissionPrefix), MonitoringURL: fmt.Sprintf("%s/", logEntry.MonitoringPrefix), TemporalInterval: TemporalInterval{ diff --git a/tesseract/genconf/main.go b/tesseract/genconf/main.go index b872806..9c7d6d7 100644 --- a/tesseract/genconf/main.go +++ b/tesseract/genconf/main.go @@ -19,6 +19,7 @@ type Config struct { type Log struct { ShortName string `yaml:"shortname"` + Domain string `yaml:"domain"` Inception string `yaml:"inception"` Period int `yaml:"period"` PoolSize int `yaml:"poolsize"` @@ -84,14 +85,25 @@ func loadConfig(yamlFile string) Config { config.Listen = []string{":8080"} } - // Set defaults for log entries + // Set defaults for log entries and check for empty/missing values for i := range config.Logs { - if config.Logs[i].PoolSize == 0 { - config.Logs[i].PoolSize = 750 + // Checks are in order of fields of the Log struct + + if config.Logs[i].ShortName == "" { + log.Fatalf("Log %d is missing a ShortName", i) } + + if config.Logs[i].Domain == "" { + log.Fatalf("Log %d (%s) is missing a value for Domain", i, config.Logs[i].ShortName) + } + if config.Logs[i].Period == 0 { config.Logs[i].Period = 200 } + + if config.Logs[i].PoolSize == 0 { + config.Logs[i].PoolSize = 750 + } } return config