Merge remote-tracking branch 'origin/master'

Dockerfile.dev

@@ -0,0 +1,20 @@
+FROM golang as build-back
+WORKDIR /wg-gen-web
+ADD . .
+RUN go build -o wg-gen-web-linux-amd64
+
+FROM node:10-alpine as build-front
+WORKDIR /ui
+ADD ui .
+RUN npm install
+RUN npm run build
+
+FROM debian:stable-slim
+WORKDIR /app
+COPY --from=build-back /wg-gen-web/wg-gen-web-linux-amd64 .
+COPY --from=build-front /ui/dist ./ui/dist
+ADD .env .
+RUN chmod +x ./wg-gen-web-linux-amd64
+EXPOSE 8080
+
+CMD ["/app/wg-gen-web-linux-amd64"]

README.md

@@ -124,7 +124,7 @@ Feel free to modify this file in order to use your existing keys
 ## What is out of scope
 
  * Generation or application of any `iptables` or `nftables` rules
- * Application of configuration to WireGuard
+ * Application of configuration to WireGuard by Wg Gen Web itself
 
 ## TODO
 

repository/repository.go

@@ -337,7 +337,7 @@ func UpdateServer(server *model.Server) (*model.Server, error) {
 
 // Write object to disk
 func serialize(id string, c interface{}) error {
-	b, err := json.Marshal(c)
+	b, err := json.MarshalIndent(c, "", "  ")
 	if err != nil {
 		return err
 	}