feat: change config paths for CLI and Database Lab server (#151)

Author: agneum

Dockerfile.dblab-server

@@ -1,4 +1,4 @@
-# Run with config.yml mount:
+# Run with server.yml mount:
 # sudo docker run \
 #   --name dblab_server \
 #   --label dblab_control \
@@ -7,7 +7,7 @@
 #   --restart on-failure \
 #   --volume /var/run/docker.sock:/var/run/docker.sock \
 #   --volume /var/lib/dblab:/var/lib/dblab:rshared \
-#   --volume ~/.dblab/configs/config.yml:/home/dblab/configs/config.yml \
+#   --volume ~/.dblab/server.yml:/home/dblab/configs/config.yml \
 #   --env VERIFICATION_TOKEN=secret_token \
 #   --detach \
 #   postgresai/dblab-server:latest
@@ -21,7 +21,7 @@
 #   --restart on-failure \
 #   --volume /var/run/docker.sock:/var/run/docker.sock \
 #   --volume /var/lib/dblab:/var/lib/dblab:rshared \
-#   --volume ~/.dblab/configs/config.yml:/home/dblab/configs/config.yml \
+#   --volume ~/.dblab/server.yml:/home/dblab/configs/config.yml \
 #   --env VERIFICATION_TOKEN=token \
 #   --env MOUNT_DIR=/var/lib/dblab/clones \
 #   --env UNIX_SOCKET_DIR=/var/lib/dblab/sockets \

cmd/cli/commands/config/file.go

@@ -6,15 +6,15 @@ package config
 
 import (
 	"io/ioutil"
-	"os"
 	"os/user"
+	"path"
 
 	"gopkg.in/yaml.v2"
 )
 
 const (
 	configPath     = ".dblab"
-	configFilename = "config"
+	configFilename = "cli.yml"
 )
 
 // GetDirname returns the CLI config path located in the current user's home directory.
@@ -24,7 +24,7 @@ func GetDirname() (string, error) {
 		return "", err
 	}
 
-	dirname := currentUser.HomeDir + string(os.PathSeparator) + configPath
+	dirname := path.Join(currentUser.HomeDir, configPath)
 
 	return dirname, nil
 }
@@ -41,7 +41,7 @@ func GetFilename() (string, error) {
 
 // BuildFileName builds a config filename.
 func BuildFileName(dirname string) string {
-	return dirname + string(os.PathSeparator) + configFilename
+	return path.Join(dirname, configFilename)
 }
 
 // Load loads a CLI config by a provided filename.

configs/config.example.logical_generic.yml

@@ -1,4 +1,4 @@
-# Copy the following to: ./configs/config.yaml
+# Copy the following to: ~/.dblab/server.yml
 
 # Database Lab API server. This API is used to work with clones
 # (list them, create, delete, see how to connect to a clone).

configs/config.example.logical_rds.yml

@@ -1,4 +1,4 @@
-# Copy the following to: ./configs/config.yaml
+# Copy the following to: ~/.dblab/server.yml
 
 # Database Lab API server. This API is used to work with clones
 # (list them, create, delete, see how to connect to a clone).

configs/config.example.physical_generic.yml

@@ -1,4 +1,4 @@
-# Copy the following to: ./configs/config.yaml
+# Copy the following to: ~/.dblab/server.yml
 
 # Database Lab API server. This API is used to work with clones
 # (list them, create, delete, see how to connect to a clone).

configs/config.example.physical_walg.yml

@@ -1,4 +1,4 @@
-# Copy the following to: ./configs/config.yaml
+# Copy the following to: ~/.dblab/server.yml
 
 # Database Lab API server. This API is used to work with clones
 # (list them, create, delete, see how to connect to a clone).