opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change ConfigProvider, so that it stops using PEM files, and starts u… (#15460)

Browse Source 
* Change ConfigProvider, so that it stops using PEM files, and starts using PKCS12 files.
Refactoring, splitting the functionality to different classes.
Some config changes that make things work in IDEA.
Reusable truststore.
Truststore stores only root certificates.

* Simpler root certificate finding

* Dir Sync does not remove cert files

* Removed unnecessary default config changes. Cleared confusing certificate copying and unnecessary certificate duplication in 2 folders

* Truststore path created outside of TruststoreCreator. Root certificate found in a different way, without considering its place in the certificate chain

* Fixed log message

* Integration test fixed

* Certs are not an exception in FullDirSync. Introduced second config location as a step towards final configuration. Certificates are moved between locations, as it was done previously

* Fixed a test. Minor refactoring.

* Config location has no default value. It is checked if it is provided, as it is required
This commit is contained in:
luk-kaminski
2023-05-16 08:38:03 +02:00
committed by GitHub
parent 5de54a57bc
commit f9dc221627
10 changed files with 263 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data-node/src/main/java/org/graylog/datanode/Configuration.java
View File

@@ -83,6 +83,9 @@ public class Configuration extends BaseConfiguration {
@Parameter(value = "opensearch_config_location")
private String opensearchConfigLocation = "config";
@Parameter(value = "config_location")
private String configLocation;
@Parameter(value = "process_logs_buffer_size")
private Integer logs = 500;
@@ -107,13 +110,13 @@ public class Configuration extends BaseConfiguration {
private String datanodeTransportCertificate = "datanode-transport-certificates.p12";
@Parameter(value = "transport_certificate_password")
private String datanodeTransportCertificatePassword = null;
private String datanodeTransportCertificatePassword;
@Parameter(value = "http_certificate")
private String datanodeHttpCertificate = "datanode-http-certificates.p12";
@Parameter(value = "http_certificate_password")
private String datanodeHttpCertificatePassword = null;
private String datanodeHttpCertificatePassword;
@Parameter(value = "stale_leader_timeout", validators = PositiveIntegerValidator.class)
private Integer staleLeaderTimeout = 2000;
@@ -156,6 +159,10 @@ public class Configuration extends BaseConfiguration {
return opensearchConfigLocation;
}
public String getConfigLocation() {
return configLocation;
}
public String getOpensearchDataLocation() {
return opensearchDataLocation;
}