Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
@@ -11,4 +11,4 @@ RUN apk upgrade
|
|||||||
COPY --from=go-build /go/wireproxy/wireproxy /usr/bin/
|
COPY --from=go-build /go/wireproxy/wireproxy /usr/bin/
|
||||||
|
|
||||||
VOLUME [ "/etc/wireproxy"]
|
VOLUME [ "/etc/wireproxy"]
|
||||||
ENTRYPOINT [ "/usr/bin/wireproxy", "/etc/wireproxy/config" ]
|
ENTRYPOINT [ "/usr/bin/wireproxy", "--config", "/etc/wireproxy/config" ]
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ public_key=%s
|
|||||||
endpoint=%s
|
endpoint=%s
|
||||||
persistent_keepalive_interval=%d
|
persistent_keepalive_interval=%d
|
||||||
preshared_key=%s
|
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}
|
setting := &DeviceSetting{ipcRequest: request, dns: conf.DNS, deviceAddr: conf.SelfEndpoint, mtu: conf.MTU}
|
||||||
return setting, nil
|
return setting, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user