diff --git a/pkg/config/env.go b/pkg/config/env.go index 62f6a71d..9099d002 100644 --- a/pkg/config/env.go +++ b/pkg/config/env.go @@ -16,25 +16,23 @@ import ( "github.com/sirupsen/logrus" ) -// getBaseDir retrieves the Abra base directory. -func getBaseDir() string { - home := os.ExpandEnv("$HOME/.abra") - if customAbraDir, exists := os.LookupEnv("ABRA_DIR"); exists && customAbraDir != "" { - home = customAbraDir +func getFromEnvOrDefault(envStr string, defaultStr string) string { + if envVar, exists := os.LookupEnv(envStr); exists && envVar != "" { + return envVar } - return home + return defaultStr } -var ABRA_DIR = getBaseDir() +var ABRA_DIR = getFromEnvOrDefault("ABRA_DIR", os.ExpandEnv("$HOME/.abra")) var SERVERS_DIR = path.Join(ABRA_DIR, "servers") var RECIPES_DIR = path.Join(ABRA_DIR, "recipes") var VENDOR_DIR = path.Join(ABRA_DIR, "vendor") var BACKUP_DIR = path.Join(ABRA_DIR, "backups") var CATALOGUE_DIR = path.Join(ABRA_DIR, "catalogue") var RECIPES_JSON = path.Join(ABRA_DIR, "catalogue", "recipes.json") -var REPOS_BASE_URL = "https://git.coopcloud.tech/coop-cloud" -var CATALOGUE_JSON_REPO_NAME = "recipes-catalogue-json" -var SSH_URL_TEMPLATE = "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git" +var REPOS_BASE_URL = getFromEnvOrDefault("ABRA_REPOS_BASE_URL", "https://git.coopcloud.tech/coop-cloud") +var CATALOGUE_JSON_REPO_NAME = getFromEnvOrDefault("ABRA_CATALOGUE_JSON_REPO_NAME", "recipes-catalogue-json") +var SSH_URL_TEMPLATE = getFromEnvOrDefault("ABRA_SSH_URL_TEMPLATE", "ssh://git@git.coopcloud.tech:2222/coop-cloud/%s.git") // envVarModifiers is a list of env var modifier strings. These are added to // env vars as comments and modify their processing by Abra, e.g. determining