Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize skywire directories #478

Merged
merged 12 commits into from
Sep 25, 2020
Merged

Standardize skywire directories #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3c0d85c
Make skywire visor look at `/opt/skywire` for apps, config and logs b…
Darkren Aug 10, 2020
18ae5fe
Merge branch 'develop' of github.com:skycoin/skywire into feature/sta…
Darkren Aug 17, 2020
46292ae
Adapt some of Makefile targets to GNU coding standards
Darkren Aug 17, 2020
dac2ab1
Modify Makefile
Darkren Aug 17, 2020
8a1b0c2
Temporarily comment out `build` target
Darkren Aug 17, 2020
8b2c063
Remove more Makefile targets
Darkren Aug 17, 2020
800c429
Remove duplicate `clean` target
Darkren Aug 17, 2020
ef88e07
Add dummy all target
Darkren Aug 17, 2020
0fd5ee2
Comment out more targets
Darkren Aug 17, 2020
72c381c
Make visor look at `/opt/skywire/` for config
Darkren Aug 18, 2020
1c13136
Revert Makefile changes
Darkren Aug 18, 2020
590c8d6
Merge branch 'feature/v0.4.0' of github.com:skycoin/skywire into feat…
Darkren Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/skywire-visor/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func initConfig(mLog *logging.MasterLogger, args []string, confPath string) *vis
}

if confPath == "" {
confPath = defaultConfigName
confPath = "/opt/skywire/" + defaultConfigName
}

fallthrough
Expand Down
18 changes: 14 additions & 4 deletions pkg/skyenv/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ import (
"github.com/skycoin/dmsg/cipher"
)

// Constants for skywire root directories.
const (
DefaultSkywirePath = "/opt/skywire"
TestSkywirePath = "."
)

// Constants for default services.
const (
DefaultTpDiscAddr = "http://transport.discovery.skywire.skycoin.com"
Expand Down Expand Up @@ -44,7 +50,8 @@ const (

DefaultDmsgPtyCLINet = "unix"
DefaultDmsgPtyCLIAddr = "/tmp/dmsgpty.sock"
DefaultDmsgPtyWhitelist = "./dmsgpty/whitelist.json"
DefaultDmsgPtyWhitelist = DefaultSkywirePath + "/dmsgpty/whitelist.json"
TestDmsgPtyWhiteList = TestSkywirePath + "/dmsgpty/whitelist.json"
)

// Default STCP constants.
Expand Down Expand Up @@ -85,14 +92,17 @@ const (
const (
DefaultAppSrvAddr = "localhost:5505"
AppDiscUpdateInterval = 30 * time.Second
DefaultAppLocalPath = "./local"
DefaultAppBinPath = "./apps"
DefaultAppLocalPath = DefaultSkywirePath + "/local"
TestAppLocalPath = TestSkywirePath + "/local"
TestAppBinPath = TestSkywirePath + "/apps"
DefaultAppBinPath = DefaultSkywirePath + "/apps"
DefaultLogLevel = "info"
)

// Default routing constants
const (
DefaultTpLogStore = "./transport_logs"
DefaultTpLogStore = DefaultSkywirePath + "/transport_logs"
TestTpLogStore = TestSkywirePath + "/transport_logs"
)

// Default hypervisor constants
Expand Down
5 changes: 5 additions & 0 deletions pkg/visor/visorconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,10 @@ func MakeTestConfig(log *logging.MasterLogger, confPath string, sk *cipher.SecKe
conf.Hypervisor.DmsgDiscovery = conf.Transport.Discovery
}

conf.Dmsgpty.AuthFile = skyenv.TestDmsgPtyWhiteList
conf.Transport.LogStore.Location = skyenv.TestTpLogStore
conf.Launcher.LocalPath = skyenv.TestAppLocalPath
conf.Launcher.BinPath = skyenv.TestAppBinPath

return conf, nil
}