From a80ea9b4c10705acd10c1291e1f5b6e5f7dd9627 Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:11:37 +0200
Subject: [PATCH] Cleanup old code and empty password for redis by default

---
 admin/main.go | 11 +----------
 api/main.go   |  8 +-------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/admin/main.go b/admin/main.go
index 5ba11ea2..ce5425df 100644
--- a/admin/main.go
+++ b/admin/main.go
@@ -170,12 +170,6 @@ var validAuth = map[string]bool{
 	settings.AuthJSON: true,
 }
 
-// Valid values for logging in configuration
-var validLogging = map[string]bool{
-	settings.LoggingDB:     true,
-	settings.LoggingSplunk: true,
-}
-
 // Function to load the configuration file
 func loadConfiguration(file, service string) (types.JSONConfigurationService, error) {
 	var cfg types.JSONConfigurationService
@@ -194,9 +188,6 @@ func loadConfiguration(file, service string) (types.JSONConfigurationService, er
 	if !validAuth[cfg.Auth] {
 		return cfg, fmt.Errorf("Invalid auth method")
 	}
-	if !validLogging[cfg.Logger] {
-		return cfg, fmt.Errorf("Invalid logging method")
-	}
 	// No errors!
 	return cfg, nil
 }
@@ -300,7 +291,7 @@ func init() {
 		},
 		&cli.StringFlag{
 			Name:        "redis-pass",
-			Value:       "redis",
+			Value:       "",
 			Usage:       "Password to be used for redis",
 			EnvVars:     []string{"REDIS_PASS"},
 			Destination: &redisConfig.Password,
diff --git a/api/main.go b/api/main.go
index 2b1da76b..5db6c47c 100644
--- a/api/main.go
+++ b/api/main.go
@@ -129,9 +129,6 @@ var validAuth = map[string]bool{
 	settings.AuthNone: true,
 	settings.AuthJWT:  true,
 }
-var validLogging = map[string]bool{
-	settings.LoggingNone: true,
-}
 
 // Function to load the configuration file and assign to variables
 func loadConfiguration(file string) (types.JSONConfigurationService, error) {
@@ -151,9 +148,6 @@ func loadConfiguration(file string) (types.JSONConfigurationService, error) {
 	if !validAuth[cfg.Auth] {
 		return cfg, fmt.Errorf("Invalid auth method: '%s'", cfg.Auth)
 	}
-	if !validLogging[cfg.Logger] {
-		return cfg, fmt.Errorf("Invalid logging method")
-	}
 	// No errors!
 	return cfg, nil
 }
@@ -250,7 +244,7 @@ func init() {
 		},
 		&cli.StringFlag{
 			Name:        "redis-pass",
-			Value:       "redis",
+			Value:       "",
 			Usage:       "Password to be used for redis",
 			EnvVars:     []string{"REDIS_PASS"},
 			Destination: &redisConfig.Password,