FEATURE set stdoutlevel & sysloglevel to 3 & remove "common" section …

…from configs
plesk · Jun 6, 2023 · ef21913 · ef21913
1 parent fc3dc0b
commit ef21913
Show file tree

Hide file tree

Showing 25 changed files with 67 additions and 48 deletions.
diff --git a/test/config-next/va.json b/test/config-next/va.json
@@ -64,8 +64,8 @@
 		]
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	},
 	"openTelemetry": {
 		"endpoint": "bjaeger:4317",

diff --git a/test/config/admin-revoker.json b/test/config/admin-revoker.json
@@ -22,7 +22,7 @@
 		"features": {}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/akamai-purger.json b/test/config/akamai-purger.json
@@ -31,7 +31,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/bad-key-revoker.json b/test/config/bad-key-revoker.json
@@ -31,7 +31,7 @@
 		"backoffIntervalMax": "2s"
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 4
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/ca-a.json b/test/config/ca-a.json
@@ -131,7 +131,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 4
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/ca-b.json b/test/config/ca-b.json
@@ -131,7 +131,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 4
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/cert-checker.json b/test/config/cert-checker.json
@@ -27,7 +27,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/crl-storer.json b/test/config/crl-storer.json
@@ -33,7 +33,7 @@
 		"awsCredsFile": "test/secrets/aws_creds.ini"
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/crl-updater.json b/test/config/crl-updater.json
@@ -33,7 +33,7 @@
 		"maxParallelism": 10
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/expiration-mailer.json b/test/config/expiration-mailer.json
@@ -30,7 +30,7 @@
 		"frequency": "1h"
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/nonce-a.json b/test/config/nonce-a.json
@@ -3,8 +3,8 @@
 		"maxUsed": 131072,
 		"noncePrefix": "taro",
 		"syslog": {
-			"stdoutLevel": 6,
-			"syslogLevel": 6
+			"stdoutLevel": 3,
+			"syslogLevel": 3
 		},
 		"debugAddr": ":8111",
 		"grpc": {

diff --git a/test/config/nonce-b.json b/test/config/nonce-b.json
@@ -3,8 +3,8 @@
 		"maxUsed": 131072,
 		"noncePrefix": "zinc",
 		"syslog": {
-			"stdoutLevel": 6,
-			"syslogLevel": 6
+			"stdoutLevel": 3,
+			"syslogLevel": 3
 		},
 		"debugAddr": ":8111",
 		"grpc": {

diff --git a/test/config/notify-mailer.json b/test/config/notify-mailer.json
@@ -10,7 +10,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutLevel": 7,
-		"syslogLevel": 7
+		"stdoutLevel": 3,
+		"syslogLevel": 3
 	}
 }
diff --git a/test/config/observer.yml b/test/config/observer.yml
@@ -2,8 +2,8 @@
 debugaddr: :8040
 buckets: [.001, .002, .005, .01, .02, .05, .1, .2, .5, 1, 2, 5, 10]
 syslog:
-  stdoutlevel: 6
-  sysloglevel: 6
+  stdoutlevel: 3
+  sysloglevel: 3
 monitors:
   -
     period: 5s

diff --git a/test/config/orphan-finder.json b/test/config/orphan-finder.json
@@ -6,8 +6,8 @@
 		"/hierarchy/intermediate-cert-ecdsa-a.pem"
 	],
 	"syslog": {
-		"stdoutlevel": 7,
-		"sysloglevel": 7
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	},
 	"tls": {
 		"caCertFile": "test/grpc-creds/minica.pem",

diff --git a/test/config/publisher.json b/test/config/publisher.json
@@ -45,7 +45,7 @@
 		"features": {}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/ra.json b/test/config/ra.json
@@ -109,7 +109,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/rocsp-tool.json b/test/config/rocsp-tool.json
@@ -17,7 +17,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/sa.json b/test/config/sa.json
@@ -52,7 +52,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/va-remote-a.json b/test/config/va-remote-a.json
@@ -35,7 +35,7 @@
 		]
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 4
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/va-remote-b.json b/test/config/va-remote-b.json
@@ -35,7 +35,7 @@
 		]
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 4
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/va.json b/test/config/va.json
@@ -56,7 +56,7 @@
 		]
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/config/wfe2.json b/test/config/wfe2.json
@@ -78,7 +78,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 4,
-		"sysloglevel": 6
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/integration/testdata/akamai-purger-queue-drain-config.json b/test/integration/testdata/akamai-purger-queue-drain-config.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"akamaiPurger": {
 		"debugAddr": ":9766",
 		"purgeRetries": 10,
@@ -35,7 +36,7 @@
 		}
 	},
 	"syslog": {
-		"stdoutlevel": 6,
-		"sysloglevel": -1
+		"stdoutlevel": 3,
+		"sysloglevel": 3
 	}
 }
diff --git a/test/issuer-ocsp-responder.json b/test/issuer-ocsp-responder.json
@@ -0,0 +1,18 @@
+{
+  "ocspResponder": {
+    "source": "file:///hierarchy/intermediate-ocsp-rsa.b64",
+    "path": "/",
+    "listenAddress": "0.0.0.0:4003",
+    "issuerCerts": [
+      "/hierarchy/intermediate-cert-rsa-a.pem"
+    ],
+    "timeout": "4.9s",
+    "shutdownStopTimeout": "10s",
+    "debugAddr": "localhost:8010"
+  },
+
+  "syslog": {
+   "stdoutlevel": 3,
+   "sysloglevel": 3
+ }
+}