diff --git a/databaseConfig.go b/databaseConfig.go index 49753eb..21cc6b3 100644 --- a/databaseConfig.go +++ b/databaseConfig.go @@ -6,4 +6,5 @@ type DatabaseConfig struct { DatabaseUser string DatabasePass string DatabaseName string + DisableSSL bool } diff --git a/getDatabaseConnectionString.go b/getDatabaseConnectionString.go index 3bee46c..b12e35d 100644 --- a/getDatabaseConnectionString.go +++ b/getDatabaseConnectionString.go @@ -5,5 +5,9 @@ import "fmt" // GetDatabaseConnectionString constructs and returns a PostgreSQL connection string // based on the current active database configuration. func GetDatabaseConnectionString() string { - return fmt.Sprintf("postgres://%s:%s@%s:%d/%s", activeConfig.DatabaseUser, activeConfig.DatabasePass, activeConfig.DatabaseHost, activeConfig.DatabasePort, activeConfig.DatabaseName) + dbString := fmt.Sprintf("postgres://%s:%s@%s:%d/%s", activeConfig.DatabaseUser, activeConfig.DatabasePass, activeConfig.DatabaseHost, activeConfig.DatabasePort, activeConfig.DatabaseName) + if activeConfig.DisableSSL { + dbString += "?sslmode=disable" + } + return dbString } diff --git a/loadConfig.go b/loadConfig.go index a82c584..8ddac32 100644 --- a/loadConfig.go +++ b/loadConfig.go @@ -23,6 +23,7 @@ func LoadConfig() error { loadedConfig.DatabaseUser = os.Getenv("DATABASE_CONFIG_DB_USER") loadedConfig.DatabasePass = os.Getenv("DATABASE_CONFIG_DB_PASS") loadedConfig.DatabaseName = os.Getenv("DATABASE_CONFIG_DB_NAME") + loadedConfig.DisableSSL = os.Getenv("DATABASE_CONFIG_DISABLE_SSL") == "true" if loadedConfig.DatabasePort == 0 { loadedConfig.DatabasePort = 5432 // default port