github.com/opengist
1
0
Fork 0
mirror of https://github.com/thomiceli/opengist synced 2024-11-08 12:55:50 +01:00
Code Releases Wiki Activity

refactor!: prefix DEV env var and deprecate CONFIG (#64)

Browse Source 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
This commit is contained in:
John Olheiser 2023-06-18 10:01:27 -05:00 committed by GitHub
parent 62711ff491
commit fc421a68b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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

10
internal/config/config.go
View File

@ -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

2
internal/web/run.go
View File

@ -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{