Merge branch 'main' into 'Viktor'

# Conflicts:
#   dbHelper/dbController.go

dbHelper/dbController.go

@@ -18,6 +18,7 @@ type PostgresConfig struct {
 	User     string `env:"POSTGRES_USER" envDefault:"postgres"`
 	Password string `env:"POSTGRES_PASSWORD" envDefault:"postgres"`
 	Database string `env:"POSTGRES_DB" envDefault:"postgres"`
+	SSLMode  string `env:"SSL_MODE" envDefault:"disable"`
 }
 
 var Db *gorm.DB
@@ -30,7 +31,7 @@ func Dbinit()  {
 		c = validConfig
 	}
 
-	dsn := string("host="+ c.Host + " user=" + c.User + " password=" + c.Password + " port=" + c.Port + " sslmode=disable TimeZone=Europe/Budapest")
+	dsn := string("host="+ c.Host + " user=" + c.User + " password=" + c.Password + " port=" + c.Port + " sslmode="+ c.SSLMode +" TimeZone=Europe/Budapest")
 
 	Db, err = gorm.Open(postgres.Open(dsn), &gorm.Config{})
 	if err != nil {