sirtimbly/cairnquire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add conflict resolution diff UI and app branding

Browse Source
This commit is contained in:
Tim Bendt
2026-05-13 16:25:28 -04:00
parent 780ff3a02c
commit d359baa010
83 changed files with 4523 additions and 3735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/server/internal/config/config.go
View File

@@ -49,7 +49,7 @@ func Default() Config {
},
Web: WebConfig{
DistDir: filepath.Join("..", "web", "dist"),
DevViteURL: os.Getenv("MD_HUB_DEV_VITE_URL"),
DevViteURL: os.Getenv("CAIRNQUIRE_DEV_VITE_URL"),
},
LogLevel: "INFO",
}
@@ -58,21 +58,21 @@ func Default() Config {
func Load() (Config, error) {
cfg := Default()
if configPath := os.Getenv("MD_HUB_CONFIG"); configPath != "" {
if configPath := os.Getenv("CAIRNQUIRE_CONFIG"); configPath != "" {
if err := loadFile(configPath, &cfg); err != nil {
return Config{}, err
}
}
overrideString(&cfg.Server.Addr, "MD_HUB_SERVER_ADDR")
overrideString(&cfg.Database.Path, "MD_HUB_DATABASE_PATH")
overrideString(&cfg.Database.PrimaryURL, "MD_HUB_DATABASE_PRIMARY_URL")
overrideString(&cfg.Database.AuthToken, "MD_HUB_DATABASE_AUTH_TOKEN")
overrideString(&cfg.Content.SourceDir, "MD_HUB_CONTENT_SOURCE_DIR")
overrideString(&cfg.Content.StoreDir, "MD_HUB_CONTENT_STORE_DIR")
overrideString(&cfg.Web.DistDir, "MD_HUB_WEB_DIST_DIR")
overrideString(&cfg.Web.DevViteURL, "MD_HUB_DEV_VITE_URL")
overrideString(&cfg.LogLevel, "MD_HUB_LOG_LEVEL")
overrideString(&cfg.Server.Addr, "CAIRNQUIRE_SERVER_ADDR")
overrideString(&cfg.Database.Path, "CAIRNQUIRE_DATABASE_PATH")
overrideString(&cfg.Database.PrimaryURL, "CAIRNQUIRE_DATABASE_PRIMARY_URL")
overrideString(&cfg.Database.AuthToken, "CAIRNQUIRE_DATABASE_AUTH_TOKEN")
overrideString(&cfg.Content.SourceDir, "CAIRNQUIRE_CONTENT_SOURCE_DIR")
overrideString(&cfg.Content.StoreDir, "CAIRNQUIRE_CONTENT_STORE_DIR")
overrideString(&cfg.Web.DistDir, "CAIRNQUIRE_WEB_DIST_DIR")
overrideString(&cfg.Web.DevViteURL, "CAIRNQUIRE_DEV_VITE_URL")
overrideString(&cfg.LogLevel, "CAIRNQUIRE_LOG_LEVEL")
if cfg.Server.Addr == "" {
return Config{}, fmt.Errorf("server.addr must not be empty")