Merge pull request #5269 from kobergj/FixPostprocessing

Fix Postprocessing service
owncloud · Dec 22, 2022 · 7e5bb96 · 7e5bb96
2 parents f3516ae + 410730c
commit 7e5bb96
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-postprocessing.md b/changelog/unreleased/fix-postprocessing.md
@@ -0,0 +1,5 @@
+Bugfix: Fix Postprocessing events
+
+Postprocessing service did not want to play with non-tls events. That is fixed now
+
+https://github.com/owncloud/ocis/pull/5269
diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go
@@ -36,7 +36,7 @@ func Server(cfg *config.Config) *cli.Command {
 			evtsCfg := cfg.Postprocessing.Events
 			var tlsConf *tls.Config
 
-			if !evtsCfg.TLSInsecure {
+			if evtsCfg.EnableTLS {
 				var rootCAPool *x509.CertPool
 				if evtsCfg.TLSRootCACertificate != "" {
 					rootCrtFile, err := os.Open(evtsCfg.TLSRootCACertificate)

diff --git a/services/postprocessing/pkg/config/config.go b/services/postprocessing/pkg/config/config.go
@@ -32,6 +32,7 @@ type Events struct {
 	Endpoint string `yaml:"endpoint" env:"POSTPROCESSING_EVENTS_ENDPOINT" desc:"Endpoint of the event system."`
 	Cluster  string `yaml:"cluster" env:"POSTPROCESSING_EVENTS_CLUSTER" desc:"Cluster ID of the event system."`
 
-	TLSInsecure          bool   `yaml:"tls_insecure" env:"OCIS_INSECURE;SEARCH_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates."`
-	TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"SEARCH_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided SEARCH_EVENTS_TLS_INSECURE will be seen as false."`
+	TLSInsecure          bool   `yaml:"tls_insecure" env:"OCIS_INSECURE;POSTPROCESSING_EVENTS_TLS_INSECURE" desc:"Whether to verify the server TLS certificates."`
+	TLSRootCACertificate string `yaml:"tls_root_ca_certificate" env:"POSTPROCESSING_EVENTS_TLS_ROOT_CA_CERTIFICATE" desc:"The root CA certificate used to validate the server's TLS certificate. If provided POSTPROCESSING_EVENTS_TLS_INSECURE will be seen as false."`
+	EnableTLS            bool   `yaml:"enable_tls" env:"OCIS_EVENTS_ENABLE_TLS;POSTPROCESSING_EVENTS_ENABLE_TLS" desc:"Enable TLS for the connection to the events broker. The events broker is the ocis service which receives and delivers events between the services.."`
 }