Merge pull request #17 from opencloud-eu/debranding-base-config-dir-path

Debrand base data and config dir path

docs/helpers/configenvextractor.go

@@ -67,8 +67,8 @@ func generateIntermediateCode(templatePath string, intermediateCodePath string,
 
 func runIntermediateCode(intermediateCodePath string) {
 	fmt.Println("Running intermediate go code for " + intermediateCodePath)
-	defaultConfigPath := "/etc/ocis"
-	defaultDataPath := "/var/lib/ocis"
+	defaultConfigPath := "/etc/opencloud"
+	defaultDataPath := "/var/lib/opencloud"
 	os.Setenv("OC_BASE_DATA_PATH", defaultDataPath)
 	os.Setenv("OC_CONFIG_DIR", defaultConfigPath)
 	out, err := exec.Command("go", "run", intermediateCodePath).CombinedOutput()

opencloud/pkg/init/functions.go

@@ -77,7 +77,7 @@ func writeConfig(configPath, ocisAdminServicePassword, targetBackupConfig string
 // writePatch writes the diff to a file
 func writePatch(configPath string, yamlOutput []byte) error {
 	fmt.Println("running in diff mode")
-	tmpFile := path.Join(configPath, "ocis.yaml.tmp")
+	tmpFile := path.Join(configPath, "opencloud.yaml.tmp")
 	err := os.WriteFile(tmpFile, yamlOutput, 0600)
 	if err != nil {
 		return err

opencloud/pkg/init/init.go

@@ -6,12 +6,13 @@ import (
 	"path"
 
 	"github.com/gofrs/uuid"
-	"github.com/opencloud-eu/opencloud/pkg/generators"
 	"gopkg.in/yaml.v2"
+
+	"github.com/opencloud-eu/opencloud/pkg/generators"
 )
 
 const (
-	configFilename = "ocis.yaml"
+	configFilename = "opencloud.yaml"
 	passwordLength = 32
 )
 

pkg/config/defaults/paths.go

@@ -6,13 +6,11 @@ import (
 	"path"
 )
 
-const ()
-
 var (
 	// switch between modes
 	BaseDataPathType = "homedir" // or "path"
 	// default data path
-	BaseDataPathValue = "/var/lib/ocis"
+	BaseDataPathValue = "/var/lib/opencloud"
 )
 
 func BaseDataPath() string {
@@ -32,7 +30,7 @@ func BaseDataPath() string {
 			// fallback to BaseDatapathValue for users without home
 			return BaseDataPathValue
 		}
-		return path.Join(dir, ".ocis")
+		return path.Join(dir, ".opencloud")
 	case "path":
 		return BaseDataPathValue
 	default:
@@ -45,7 +43,7 @@ var (
 	// switch between modes
 	BaseConfigPathType = "homedir" // or "path"
 	// default config path
-	BaseConfigPathValue = "/etc/ocis"
+	BaseConfigPathValue = "/etc/opencloud"
 )
 
 func BaseConfigPath() string {
@@ -65,7 +63,7 @@ func BaseConfigPath() string {
 			// fallback to BaseConfigPathValue for users without home
 			return BaseConfigPathValue
 		}
-		return path.Join(dir, ".ocis", "config")
+		return path.Join(dir, ".opencloud", "config")
 	case "path":
 		return BaseConfigPathValue
 	default:

pkg/config/parser/parse.go

@@ -9,11 +9,11 @@ import (
 	"github.com/opencloud-eu/opencloud/pkg/structs"
 )
 
-// ParseConfig loads the ocis configuration and
+// ParseConfig loads the opencloud configuration and
 // copies applicable parts into the commons part, from
 // where the services can copy it into their own config
 func ParseConfig(cfg *config.Config, skipValidate bool) error {
-	err := config.BindSourcesToStructs("ocis", cfg)
+	err := config.BindSourcesToStructs("opencloud", cfg)
 	if err != nil {
 		return err
 	}