From f272e269787f0db46d8f90c7ec2cd37e6d4e299a Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 7 May 2024 14:21:22 +0200 Subject: refactor: make data path (partially) configurable --- internal/config/config.go | 7 ++++--- internal/server/server.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'internal') diff --git a/internal/config/config.go b/internal/config/config.go index e9300ce..c721424 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -24,9 +24,10 @@ func (u *URL) UnmarshalText(text []byte) (err error) { } type Config struct { - BaseURL URL `toml:"base_url"` - CSP *CSP `toml:"content-security-policy"` - Headers map[string]string + BaseURL URL `toml:"base_url"` + DataPath string `toml:"data_path"` + CSP *CSP `toml:"content-security-policy"` + Headers map[string]string } func GetConfig() (*Config, error) { diff --git a/internal/server/server.go b/internal/server/server.go index 76fbecb..db93092 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -183,7 +183,7 @@ func New(runtimeConfig *Config) (*Server, error) { }) var nixosOptions = options.NixOptions{} - jsonFile, err := os.ReadFile(path.Join("data", "test.json")) + jsonFile, err := os.ReadFile(path.Join(config.DataPath, "test.json")) if err != nil { slog.Error(fmt.Sprintf("error reading json file: %v", err)) } -- cgit 1.4.1