Merge branch 'master' into Design

README.md

@@ -54,6 +54,14 @@ docker run \
   place1/wg-access-server
 ```
 
+To use a custom [configuration](#configuration) file, please add a `CONFIG` environment variable and make sure the configuration file is mounted:
+```
+  ...
+  -e CONFIG=/config/config.yaml
+  -v ./config.yaml:/config/config.yaml
+  ...
+```
+
 ## Configuration
 
 You can configure the server using a config file.

internal/services/devices.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"fmt"
+	"os"
 	"net"
 	"sync"
 	"time"
@@ -67,7 +68,11 @@ func (d *DeviceManager) AddDevice(user string, name string, publicKey string) (*
 }
 
 func (d *DeviceManager) ListDevices(user string) ([]*storage.Device, error) {
-	return d.storage.List(user + "/")
+	prefix := ""
+	if (user != "") {
+		prefix = user + string(os.PathSeparator)
+	}
+	return d.storage.List(prefix)
 }
 
 func (d *DeviceManager) DeleteDevice(user string, name string) error {

internal/storage/disk.go

@@ -50,6 +50,7 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 			return nil
 		}
 		p := strings.TrimPrefix(path, s.directory)
+		p = strings.TrimPrefix(p, string(os.PathSeparator))
 		if strings.HasPrefix(p, prefix) {
 			files = append(files, path)
 		}
@@ -58,6 +59,8 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to list storage directory")
 	}
+	logrus.Debugf("Found files: %+v", files)
+
 	devices := []*Device{}
 	for _, file := range files {
 		bytes, err := ioutil.ReadFile(file)
@@ -73,6 +76,7 @@ func (s *DiskStorage) List(prefix string) ([]*Device, error) {
 		}
 		devices = append(devices, device)
 	}
+	logrus.Debugf("Found devices: %+v", devices)
 	return devices, nil
 }
 

website/.prettierrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  semi: true,
+  trailingComma: "all",
+  singleQuote: true,
+  printWidth: 120,
+  tabWidth: 2,
+};