all: sync with master

internal/home/config.go

@@ -32,6 +32,9 @@ const dataDir = "data"
 
 // logSettings are the logging settings part of the configuration file.
 type logSettings struct {
+	// Enabled indicates whether logging is enabled.
+	Enabled bool `yaml:"enabled"`
+
 	// File is the path to the log file.  If empty, logs are written to stdout.
 	// If "syslog", logs are written to syslog.
 	File string `yaml:"file"`
@@ -385,7 +388,7 @@ var config = &configuration{
 		Ignored:  []string{},
 	},
 	// NOTE: Keep these parameters in sync with the one put into
-	// client/src/helpers/filters/filters.js by scripts/vetted-filters.
+	// client/src/helpers/filters/filters.ts by scripts/vetted-filters.
 	//
 	// TODO(a.garipov): Think of a way to make scripts/vetted-filters update
 	// these as well if necessary.
@@ -454,11 +457,14 @@ var config = &configuration{
 		},
 	},
 	Log: logSettings{
-		Compress:   false,
-		LocalTime:  false,
+		Enabled:    true,
+		File:       "",
 		MaxBackups: 0,
 		MaxSize:    100,
 		MaxAge:     3,
+		Compress:   false,
+		LocalTime:  false,
+		Verbose:    false,
 	},
 	OSConfig:      &osConfig{},
 	SchemaVersion: configmigrate.LastSchemaVersion,