diff --git a/Dockerfile b/Dockerfile index f0e665b..5373901 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ COPY frontend/ /app RUN cd /app && npm install && npm run build FROM golang:1.17.3-buster AS backend-builder +RUN go env -w GOPROXY=https://goproxy.cn RUN go install github.com/gobuffalo/packr/v2/packr2@latest COPY --from=frontend-builder /app/static /app/frontend/static COPY . /app diff --git a/install-deps-arm.sh b/install-deps-arm.sh index 69994c7..3f239a3 100755 --- a/install-deps-arm.sh +++ b/install-deps-arm.sh @@ -9,4 +9,5 @@ apt-get install -y nodejs PATH=$PATH:~/go/bin +go env -w GOPROXY=https://goproxy.cn go install github.com/gobuffalo/packr/v2/packr2@latest diff --git a/install-deps.sh b/install-deps.sh index 80f0287..a5fa2ba 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -9,4 +9,5 @@ apt-get install -y nodejs PATH=$PATH:~/go/bin +go env -w GOPROXY=https://goproxy.cn go install github.com/gobuffalo/packr/v2/packr2@latest diff --git a/main.go b/main.go index bc4a72c..f8ab3a6 100644 --- a/main.go +++ b/main.go @@ -52,7 +52,7 @@ var ( masterBasicAuthPassword = kingpin.Flag("master.basic-auth.password", "password for master server's Basic Auth").Default("").Envar("OVPN_MASTER_PASSWORD").String() masterSyncFrequency = kingpin.Flag("master.sync-frequency", "master host data sync frequency in seconds").Default("600").Envar("OVPN_MASTER_SYNC_FREQUENCY").Int() masterSyncToken = kingpin.Flag("master.sync-token", "master host data sync security token").Default("VerySecureToken").Envar("OVPN_MASTER_TOKEN").PlaceHolder("TOKEN").String() - openvpnNetwork = kingpin.Flag("ovpn.network", "NETWORK/MASK_PREFIX for OpenVPN server").Default("172.16.100.0/24").Envar("OVPN_NETWORK").String() + openvpnNetwork = kingpin.Flag("ovpn.network", "NETWORK/MASK_PREFIX for OpenVPN server").Default("192.168.100.0/24").Envar("OVPN_NETWORK").String() openvpnServer = kingpin.Flag("ovpn.server", "HOST:PORT:PROTOCOL for OpenVPN server; can have multiple values").Default("127.0.0.1:7777:tcp").Envar("OVPN_SERVER").PlaceHolder("HOST:PORT:PROTOCOL").Strings() openvpnServerBehindLB = kingpin.Flag("ovpn.server.behindLB", "enable if your OpenVPN server is behind Kubernetes Service having the LoadBalancer type").Default("false").Envar("OVPN_LB").Bool() openvpnServiceName = kingpin.Flag("ovpn.service", "the name of Kubernetes Service having the LoadBalancer type if your OpenVPN server is behind it").Default("openvpn-external").Envar("OVPN_LB_SERVICE").Strings()