skycoin · nkryuchkov · Nov 4, 2020 · Nov 3, 2020 · Nov 3, 2020 · Nov 3, 2020
diff --git a/Makefile b/Makefile
@@ -164,16 +164,16 @@ build-deploy: ## Build for deployment Docker images
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks ./cmd/apps/skysocks
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks-client ./cmd/apps/skysocks-client
 
-package-amd64: install-deps-ui lint-ui build-ui ## Build the debian package.
+package-amd64: ## Build the debian package.
 	scripts/dPKGBUILD.sh amd64
 
-package-arm64: install-deps-ui lint-ui build-ui ## Build the debian package.
+package-arm64: ## Build the debian package.
 	scripts/dPKGBUILD.sh arm64
 
-package-armhf:  install-deps-ui lint-ui build-ui ## Build the debian package.
+package-armhf: ## Build the debian package.
 	scripts/dPKGBUILD.sh armhf
 
-all-packages: install-deps-ui lint-ui build-ui
+all-packages: ## Build the debian package.
 	scripts/dPKGBUILD.sh amd64
 	scripts/dPKGBUILD.sh arm64
 	scripts/dPKGBUILD.sh armhf

diff --git a/cmd/skywire-cli/commands/visor/gen-config.go b/cmd/skywire-cli/commands/visor/gen-config.go
@@ -19,17 +19,19 @@ func init() {
 }
 
 var (
-	sk         cipher.SecKey
-	output     string
-	replace    bool
-	testEnv    bool
-	hypervisor bool
+	sk            cipher.SecKey
+	output        string
+	replace       bool
+	testEnv       bool
+	packageConfig bool
+	hypervisor    bool
 )
 
 func init() {
 	genConfigCmd.Flags().Var(&sk, "sk", "if unspecified, a random key pair will be generated.")
 	genConfigCmd.Flags().StringVarP(&output, "output", "o", "skywire-config.json", "path of output config file.")
 	genConfigCmd.Flags().BoolVarP(&replace, "replace", "r", false, "whether to allow rewrite of a file that already exists (this retains the keys).")
+	genConfigCmd.Flags().BoolVarP(&packageConfig, "package", "p", false, "use defaults for package-based installations")
 	genConfigCmd.Flags().BoolVarP(&testEnv, "testenv", "t", false, "whether to use production or test deployment service.")
 	genConfigCmd.Flags().BoolVar(&hypervisor, "hypervisor", false, "whether to generate hypervisor config.")
 }
@@ -58,7 +60,11 @@ var genConfigCmd = &cobra.Command{
 
 		// Determine config type to generate.
 		var genConf func(log *logging.MasterLogger, confPath string, sk *cipher.SecKey, hypervisor bool) (*visorconfig.V1, error)
-		if testEnv {
+
+		// to be improved later
+		if packageConfig {
+			genConf = visorconfig.MakePackageConfig
+		} else if testEnv {
 			genConf = visorconfig.MakeTestConfig
 		} else {
 			genConf = visorconfig.MakeDefaultConfig

diff --git a/go.mod b/go.mod
@@ -35,7 +35,7 @@ require (
 	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
 	go.etcd.io/bbolt v1.3.5
 	golang.org/x/net v0.0.0-20200625001655-4c5254603344
-	golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c // indirect
+	golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c
 	golang.zx2c4.com/wireguard v0.0.20200320
 	nhooyr.io/websocket v1.8.2
 )

diff --git a/internal/utclient/mock_api_client.go b/internal/utclient/mock_api_client.go
diff --git a/pkg/app/appevent/mock_rpc_client.go b/pkg/app/appevent/mock_rpc_client.go
diff --git a/pkg/app/appnet/mock_networker.go b/pkg/app/appnet/mock_networker.go
diff --git a/pkg/app/appserver/mock_proc_manager.go b/pkg/app/appserver/mock_proc_manager.go
diff --git a/pkg/app/appserver/mock_rpc_ingress_client.go b/pkg/app/appserver/mock_rpc_ingress_client.go
diff --git a/pkg/routefinder/rfclient/mock_client.go b/pkg/routefinder/rfclient/mock_client.go
diff --git a/pkg/router/mock_router.go b/pkg/router/mock_router.go
diff --git a/pkg/setup/mock_id_reserver.go b/pkg/setup/mock_id_reserver.go
diff --git a/pkg/setup/setupclient/mock_route_group_dialer.go b/pkg/setup/setupclient/mock_route_group_dialer.go
diff --git a/pkg/skyenv/values.go b/pkg/skyenv/values.go
@@ -8,8 +8,8 @@ import (
 
 // Constants for skywire root directories.
 const (
-	DefaultSkywirePath = "/opt/skywire"
-	TestSkywirePath    = "."
+	DefaultSkywirePath = "."
+	PackageSkywirePath = "/opt/skywire"
 )
 
 // Constants for default services.
@@ -51,7 +51,7 @@ const (
 	DefaultDmsgPtyCLINet    = "unix"
 	DefaultDmsgPtyCLIAddr   = "/tmp/dmsgpty.sock"
 	DefaultDmsgPtyWhitelist = DefaultSkywirePath + "/dmsgpty/whitelist.json"
-	TestDmsgPtyWhiteList    = TestSkywirePath + "/dmsgpty/whitelist.json"
+	PackageDmsgPtyWhiteList = PackageSkywirePath + "/dmsgpty/whitelist.json"
 )
 
 // Default STCP constants.
@@ -93,21 +93,28 @@ const (
 	DefaultAppSrvAddr     = "localhost:5505"
 	AppDiscUpdateInterval = 30 * time.Second
 	DefaultAppLocalPath   = DefaultSkywirePath + "/local"
-	TestAppLocalPath      = TestSkywirePath + "/local"
-	TestAppBinPath        = TestSkywirePath + "/apps"
 	DefaultAppBinPath     = DefaultSkywirePath + "/apps"
 	DefaultLogLevel       = "info"
+	PackageAppLocalPath   = PackageSkywirePath + "/local"
+	PackageAppBinPath     = PackageSkywirePath + "/apps"
 )
 
 // Default routing constants
 const (
 	DefaultTpLogStore = DefaultSkywirePath + "/transport_logs"
-	TestTpLogStore    = TestSkywirePath + "/transport_logs"
+	PackageTpLogStore = PackageSkywirePath + "/transport_logs"
 )
 
 // Default hypervisor constants
 const (
 	DefaultHypervisorDB = ".skycoin/hypervisor/users.db"
+	DefaultEnableAuth   = true
+	DefaultEnableTLS    = false
+	DefaultTLSKey       = DefaultSkywirePath + "/ssl/key.pem"
+	DefaultTLSCert      = DefaultSkywirePath + "/ssl/cert.pem"
+	PackageEnableTLS    = true
+	PackageTLSKey       = PackageSkywirePath + "/ssl/key.pem"
+	PackageTLSCert      = PackageSkywirePath + "/ssl/cert.pem"
 )
 
 // MustPK unmarshals string PK to cipher.PubKey. It panics if unmarshaling fails.

diff --git a/pkg/snet/arclient/mock_api_client.go b/pkg/snet/arclient/mock_api_client.go
diff --git a/pkg/snet/mock_dialer.go b/pkg/snet/mock_dialer.go
diff --git a/pkg/visor/hypervisorconfig/config.go b/pkg/visor/hypervisorconfig/config.go
@@ -81,7 +81,7 @@ func GenerateWorkDirConfig(testenv bool) Config {
 // GenerateHomeConfig generates a config with default values and uses db from user's home folder.
 func GenerateHomeConfig(testenv bool) Config {
 	c := MakeConfig(testenv)
-	c.DBPath = filepath.Join(pathutil.HomeDir(), ".skycoin/hypervisor/users.db")
+	c.DBPath = filepath.Join(pathutil.HomeDir(), skyenv.DefaultHypervisorDB)
 	return c
 }
 
@@ -123,6 +123,14 @@ func (c *Config) FillDefaults(testEnv bool) {
 	}
 
 	c.Cookies.FillDefaults()
+
+	c.EnableAuth = skyenv.DefaultEnableAuth
+
+	c.EnableTLS = skyenv.DefaultEnableTLS
+
+	c.TLSCertFile = skyenv.DefaultTLSCert
+	c.TLSKeyFile = skyenv.DefaultTLSKey
+
 }
 
 // Parse parses the file in path, and decodes to the config.

diff --git a/pkg/visor/visorconfig/config.go b/pkg/visor/visorconfig/config.go
@@ -153,10 +153,36 @@ 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
+}
+
+// MakePackageConfig acts like MakeDefaultConfig but use package config defaults
+func MakePackageConfig(log *logging.MasterLogger, confPath string, sk *cipher.SecKey, hypervisor bool) (*V1, error) {
+	conf, err := MakeDefaultConfig(log, confPath, sk, hypervisor)
+	if err != nil {
+		return nil, err
+	}
+
+	conf.Dmsgpty = &V1Dmsgpty{
+		Port:     skyenv.DmsgPtyPort,
+		AuthFile: skyenv.PackageDmsgPtyWhiteList,
+		CLINet:   skyenv.DefaultDmsgPtyCLINet,
+		CLIAddr:  skyenv.DefaultDmsgPtyCLIAddr,
+	}
+
+	conf.Transport.LogStore = &V1LogStore{
+		Type:     "file",
+		Location: skyenv.PackageTpLogStore,
+	}
+
+	conf.Launcher.BinPath = skyenv.PackageAppBinPath
+	conf.Launcher.LocalPath = skyenv.PackageAppLocalPath
 
+	if conf.Hypervisor != nil {
+		conf.Hypervisor.EnableAuth = skyenv.DefaultEnableAuth
+		conf.Hypervisor.EnableTLS = skyenv.PackageEnableTLS
+		conf.Hypervisor.TLSKeyFile = skyenv.PackageTLSKey
+		conf.Hypervisor.TLSCertFile = skyenv.PackageTLSCert
+	}
 	return conf, nil
 }