ociscfg -> occfg

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-14 12:44:00 +01:00
parent af290b31cd
commit 5aa5ab843a
45 changed files with 142 additions and 142 deletions
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config"
"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config"
"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config"
"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config"
"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/audit/pkg/config"
"github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"os"
"github.com/opencloud-eu/opencloud/pkg/clihelper"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config"
"github.com/thejerf/suture/v4"
"github.com/urfave/cli/v2"
@@ -42,7 +42,7 @@ type SutureService struct {
}
// NewSutureService creates a new auth-bearer.SutureService
func NewSutureService(cfg *ociscfg.Config) suture.Service {
func NewSutureService(cfg *occfg.Config) suture.Service {
cfg.AuthBearer.Commons = cfg.Commons
return SutureService{
cfg: cfg.AuthBearer,
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config"
"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config"
"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -5,7 +5,7 @@ import (
"fmt"
"net/url"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
ocisdefaults "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config"
"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/frontend/pkg/config"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/go-ldap/ldap/v3"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared"
@@ -17,7 +17,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/groups/pkg/config"
"github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/idm/pkg/config"
"github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/idp/pkg/config"
"github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/invitations/pkg/config"
"github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/nats/pkg/config"
"github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -6,7 +6,7 @@ import (
"net/mail"
"strings"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config"
"github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
@@ -17,7 +17,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config"
"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/structs"
"github.com/opencloud-eu/opencloud/services/ocm/pkg/config"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/opencloud-eu/opencloud/services/ocs/pkg/config"
"github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/policies/pkg/config"
"github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/cs3org/reva/v2/pkg/events"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config"
"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config"
"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
@@ -14,7 +14,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/search/pkg/config"
"github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config"
"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
"github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults"
@@ -17,7 +17,7 @@ const (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/sse/pkg/config"
"github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config"
"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/storage-users/pkg/config"
@@ -15,7 +15,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config"
"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config"
"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/users/pkg/config"
"github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults"
@@ -13,7 +13,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
+3 -3
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/config/envdecode"
"github.com/opencloud-eu/opencloud/pkg/shared"
"github.com/opencloud-eu/opencloud/services/web/pkg/config"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -28,7 +28,7 @@ func ParseConfig(cfg *config.Config) error {
}
// apps are a special case, as they are not part of the main config, but are loaded from a separate config file
err = ociscfg.BindSourcesToStructs("apps", &cfg.Apps)
err = occfg.BindSourcesToStructs("apps", &cfg.Apps)
if err != nil {
return err
}
+2 -2
View File
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/config"
"github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}
@@ -3,7 +3,7 @@ package parser
import (
"errors"
ociscfg "github.com/opencloud-eu/opencloud/pkg/config"
occfg "github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config"
"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults"
@@ -12,7 +12,7 @@ import (
// ParseConfig loads configuration from known paths.
func ParseConfig(cfg *config.Config) error {
err := ociscfg.BindSourcesToStructs(cfg.Service.Name, cfg)
err := occfg.BindSourcesToStructs(cfg.Service.Name, cfg)
if err != nil {
return err
}