Rename USER_DATA to ROVE_USER_DATA

This commit is contained in:
Marc Di Luzio 2020-06-27 00:02:07 +01:00
parent 4a343f36a8
commit f9c30f541c
3 changed files with 4 additions and 4 deletions

View file

@ -33,7 +33,7 @@ func printUsage() {
fmt.Fprintln(os.Stderr, "\thelp outputs this usage information") fmt.Fprintln(os.Stderr, "\thelp outputs this usage information")
fmt.Fprintln(os.Stderr, "\tversion outputs version info") fmt.Fprintln(os.Stderr, "\tversion outputs version info")
fmt.Fprintln(os.Stderr, "\nEnvironment") fmt.Fprintln(os.Stderr, "\nEnvironment")
fmt.Fprintln(os.Stderr, "\tUSER_DATA path to user data, defaults to "+defaultDataPath) fmt.Fprintln(os.Stderr, "\tROVE_USER_DATA path to user data, defaults to "+defaultDataPath)
} }
const gRPCport = 9090 const gRPCport = 9090
@ -48,7 +48,7 @@ type Config struct {
func ConfigPath() string { func ConfigPath() string {
// Allow overriding the data path // Allow overriding the data path
var datapath = defaultDataPath var datapath = defaultDataPath
var override = os.Getenv("USER_DATA") var override = os.Getenv("ROVE_USER_DATA")
if len(override) > 0 { if len(override) > 0 {
datapath = override datapath = override
} }

View file

@ -17,7 +17,7 @@ func Test_InnerMain(t *testing.T) {
// Use temporary local user data // Use temporary local user data
tmp, err := ioutil.TempDir(os.TempDir(), "rove-") tmp, err := ioutil.TempDir(os.TempDir(), "rove-")
assert.NoError(t, err) assert.NoError(t, err)
os.Setenv("USER_DATA", tmp) os.Setenv("ROVE_USER_DATA", tmp)
// Used for configuring this test // Used for configuring this test
var address = os.Getenv("ROVE_GRPC") var address = os.Getenv("ROVE_GRPC")

View file

@ -17,7 +17,7 @@ apps:
plugs: plugs:
- network - network
environment: environment:
USER_DATA: $SNAP_USER_DATA ROVE_USER_DATA: $SNAP_USER_DATA
rove-server: rove-server:
command: bin/rove-server command: bin/rove-server
plugs: plugs: