Merge remote-tracking branch 'refs/remotes/origin/master'

pufferffish · Apr 3, 2022 · 2b116ff · 2b116ff
2 parents 6ab6551 + 6bdeffe
commit 2b116ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -11,4 +11,4 @@ RUN apk upgrade
 COPY --from=go-build /go/wireproxy/wireproxy /usr/bin/
 
 VOLUME [ "/etc/wireproxy"]
-ENTRYPOINT [ "/usr/bin/wireproxy", "/etc/wireproxy/config" ]
+ENTRYPOINT [ "/usr/bin/wireproxy", "--config", "/etc/wireproxy/config" ]
diff --git a/wireguard.go b/wireguard.go
@@ -24,7 +24,8 @@ public_key=%s
 endpoint=%s
 persistent_keepalive_interval=%d
 preshared_key=%s
-allowed_ip=0.0.0.0/0`, conf.SelfSecretKey, conf.PeerPublicKey, conf.PeerEndpoint, conf.KeepAlive, conf.PreSharedKey)
+allowed_ip=0.0.0.0/0
+allowed_ip=::0/0`, conf.SelfSecretKey, conf.PeerPublicKey, conf.PeerEndpoint, conf.KeepAlive, conf.PreSharedKey)
 
 	setting := &DeviceSetting{ipcRequest: request, dns: conf.DNS, deviceAddr: conf.SelfEndpoint, mtu: conf.MTU}
 	return setting, nil