up

Author: tossp

.travis.yml

@@ -11,6 +11,9 @@ script:
   #  - go vet ./...
   #  - go test -v -race -coverprofile=coverage.txt -covermode=atomic ./...
   #  - go test -v -tags=integration -run=^$ ./test/integration # Check that integration test builds successfully, but don't run any of the tests (they hit live GitHub API).
+  - curl -s "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=gue2VsUdfd5SUw6l&suffix=tar.gz" -o GeoLite2-City.tar.gz
+  - tar -xzf GeoLite2-City.tar.gz
+  - find . -name '*.mmdb' -exec mv {} ./web/resources/GeoLite2-City/ \;
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then go build -o core -ldflags '-s -w' misc/exe/teaweb/main.go ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then go build -o agent -ldflags '-s -w' misc/exe/pluginsAgent/main.go ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then go build -o core-agent -ldflags '-s -w' misc/exe/agent/main.go ; fi
@@ -21,9 +24,9 @@ script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 before_deploy:
-  - curl -O http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
-  - gunzip GeoLite2-City.mmdb.gz
-  - mv GeoLite2-City.mmdb web/resources/GeoLite2-City/
+  - curl -s "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=gue2VsUdfd5SUw6l&suffix=tar.gz" -o GeoLite2-City.tar.gz
+  - tar -xzf GeoLite2-City.tar.gz
+  - find . -name '*.mmdb' -exec mv {} ./web/resources/GeoLite2-City/ \;
   - mkdir -p releases/{bin,plugins}
   - cp -R ./{configs,scripts,web,www,logs,upgrade.sh} releases/
   - cp configs/admin.sample.conf releases/configs/admin.conf

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
 	github.com/TeaWeb/agent v0.0.0-20191129072344-6274ce47207a
 	github.com/TeaWeb/agentinstaller v0.0.0-20190530050440-5fefd21025a9
-	github.com/TeaWeb/code v0.1.73-0.20200314110258-e36119198e20
+	github.com/TeaWeb/code v0.1.73-0.20200317085238-2731f9f8000e
 	github.com/TeaWeb/plugin v0.0.0-20190202040243-6fb957e0eb4a
 	github.com/TeaWeb/uaparser v0.0.0-20190526084055-a1c9449348d8 // indirect
 	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190430075129-62f3cb8727f4 // indirect

go.sum

@@ -6,8 +6,8 @@ github.com/TeaWeb/agent v0.0.0-20191129072344-6274ce47207a h1:mnPY948EeM107HWiX3
 github.com/TeaWeb/agent v0.0.0-20191129072344-6274ce47207a/go.mod h1:sKq3cDTMkEgazeYI4TKo03Xz9PTPwMZ2yiQnPg+qXLs=
 github.com/TeaWeb/agentinstaller v0.0.0-20190530050440-5fefd21025a9 h1:uFHM1AU8+iHtv3Dscb5G4FG8MqDiT79RyTE5+SSLmgk=
 github.com/TeaWeb/agentinstaller v0.0.0-20190530050440-5fefd21025a9/go.mod h1:RvsddRGxwRrdDxcVZAaOgn1md7ZNzFhqM/v9UxKpdV8=
-github.com/TeaWeb/code v0.1.73-0.20200314110258-e36119198e20 h1:0CXW6u5yaradtGlvprrOgpArKzFtaamcyhAWH0UKk/g=
-github.com/TeaWeb/code v0.1.73-0.20200314110258-e36119198e20/go.mod h1:adA5myW2JZ7qj/53ar6HUFNftRCbXadWJQhVj7iIulM=
+github.com/TeaWeb/code v0.1.73-0.20200317085238-2731f9f8000e h1:Zg4rT4EX7+B8gyPFJlSa+pU3JIsTyrSIQquD4PrxhDU=
+github.com/TeaWeb/code v0.1.73-0.20200317085238-2731f9f8000e/go.mod h1:adA5myW2JZ7qj/53ar6HUFNftRCbXadWJQhVj7iIulM=
 github.com/TeaWeb/plugin v0.0.0-20190202040243-6fb957e0eb4a h1:eBirFjqMtroy4c/kqy+wh1JHuDMNMzPSf4IupEYxt1A=
 github.com/TeaWeb/plugin v0.0.0-20190202040243-6fb957e0eb4a/go.mod h1:HZS9S9Dr7LiAMPAJtQn0A60wU6zFi/wZ49uK+g058R8=
 github.com/TeaWeb/uaparser v0.0.0-20190526084055-a1c9449348d8 h1:RB/ViZWtFrBoOBCl1G/BoK+vwN5fn1T6Nu0ZRAX+pzM=