diff --git a/Makefile b/Makefile index cd6df67..c71efac 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ watch_frontend: watch_backend: @echo "Building Opengist binary..." - DEV=1 ./node_modules/.bin/nodemon --watch '**/*' -e html,yml,go,js --signal SIGTERM --exec 'go run . --config config.yml' + OG_DEV=1 ./node_modules/.bin/nodemon --watch '**/*' -e html,yml,go,js --signal SIGTERM --exec 'go run . --config config.yml' watch: @bash ./watch.sh diff --git a/internal/config/config.go b/internal/config/config.go index aab17da..157b286 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -2,15 +2,16 @@ package config import ( "fmt" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - "github.com/thomiceli/opengist/internal/utils" - "gopkg.in/yaml.v3" "os" "path/filepath" "reflect" "strconv" "strings" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "github.com/thomiceli/opengist/internal/utils" + "gopkg.in/yaml.v3" ) var OpengistVersion = "1.4.0-dev" @@ -173,6 +174,7 @@ func loadConfigFromYaml(c *config, configPath string) error { configEnv := os.Getenv("CONFIG") if configEnv != "" { fmt.Println("Using config from environment variable: CONFIG") + fmt.Println("!! This method of setting the config is deprecated and will be removed in a future version of Opengist") d := yaml.NewDecoder(strings.NewReader(configEnv)) if err := d.Decode(&c); err != nil { return err diff --git a/internal/web/run.go b/internal/web/run.go index 00802c8..a83f1dd 100644 --- a/internal/web/run.go +++ b/internal/web/run.go @@ -24,7 +24,7 @@ import ( "time" ) -var dev = os.Getenv("DEV") == "1" +var dev = os.Getenv("OG_DEV") == "1" var store *sessions.CookieStore var re = regexp.MustCompile("[^a-z0-9]+") var fm = template.FuncMap{