diff --git a/.drone.yml b/.drone.yml index ef67311..58aa920 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,7 +61,7 @@ steps: - cd ./pkg/login-app/cmd && go build -buildvcs=false -v -ldflags="-s -w" -o ../../../dist/login-app . && cd - environment: CGO_ENABLED: 0 - GOARM: 7 + GOARM: 5 - name: deploy binaries image: appleboy/drone-scp:linux-arm diff --git a/token-validator/wg.go b/token-validator/wg.go index 2bca040..ec44ba4 100644 --- a/token-validator/wg.go +++ b/token-validator/wg.go @@ -152,11 +152,8 @@ PersistentKeepalive = 5 # MyNetwork=%s/%d # GWIPv6=%s # MyLogin=%s -`, base64.StdEncoding.EncodeToString(tinfo.SrvPubKey), "82.64.31.248", tinfo.SrvPort, tinfo.CltIPv6, token.SuffixIP, 64, tinfo.CltIPv6, tinfo.CltRange, tinfo.SrvGW6, student.Login))) - if version > 2 { - w.Write([]byte(fmt.Sprintf(`# KeySign=%s`, base64.StdEncoding.EncodeToString(token.GenKeySign())))) - } - +# KeySign=%s +`, base64.StdEncoding.EncodeToString(tinfo.SrvPubKey), "82.64.31.248", tinfo.SrvPort, tinfo.CltIPv6, token.SuffixIP, 64, tinfo.CltIPv6, tinfo.CltRange, tinfo.SrvGW6, student.Login, base64.StdEncoding.EncodeToString(token.GenKeySign())))) } func updateWgTunnel(student *adlin.Student, ps httprouter.Params, body []byte) (interface{}, error) {