From b5204d87e67970176a60bffcaf7a29fd1ab0acbc Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Tue, 28 Dec 2021 00:07:56 +0000 Subject: [PATCH] burble.dn42 customisations --- .drone.yml | 59 +++++++++++++++++++++++++++ README.md | 2 + frontend/assets/templates/bgpmap.tpl | 2 +- frontend/assets/templates/bird.tpl | 2 +- frontend/assets/templates/page.tpl | 4 +- frontend/assets/templates/summary.tpl | 7 ++-- frontend/assets/templates/whois.tpl | 2 +- frontend/webserver.go | 10 ++++- 8 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..b434427 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,59 @@ +--- +kind: pipeline +type: docker +name: default + +steps: + - name: build frontend + image: golang + environment: + CGO_ENABLED: 0 + commands: + - cd frontend + - go vet + - go build + + - name: build proxy + image: golang + environment: + CGO_ENABLED: 0 + commands: + - cd proxy + - go vet + - go build + + - name: stage + image: alpine + commands: + - mkdir artifacts + - mv frontend/frontend artifacts/ + - mv proxy/proxy artifacts/ + + - name: upload + image: plugins/s3 + settings: + bucket: artifacts + access_key: + from_secret: MINIO_ACCESS_KEY + secret_key: + from_secret: MINIO_SECRET_KEY + endpoint: https://minio.burble.dn42 + region: uk-lon3 + path_style: true + source: artifacts/* + strip_prefix: artifacts/ + target: /bird-lg-go/${DRONE_BRANCH} + +--- +kind: secret +name: MINIO_ACCESS_KEY +get: + path: burble.dn42/kv/data/drone/minio + name: ACCESS_KEY + +--- +kind: secret +name: MINIO_SECRET_KEY +get: + path: burble.dn42/kv/data/drone/minio + name: SECRET_KEY diff --git a/README.md b/README.md index 7735c06..6efb99a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Bird-lg-go +[![Build Status](https://ci.burble.dn42/api/badges/burble.dn42/bird-lg-go/status.svg?ref=refs/heads/burble.dn42)](https://ci.burble.dn42/burble.dn42/bird-lg-go) + An alternative implementation for [bird-lg](https://github.com/sileht/bird-lg) written in Go. Both frontend and backend (proxy) are implemented, and can work with either the original Python implementation or the Go implementation. > The code on master branch no longer support BIRDv1. Branch "bird1" is the last version that supports BIRDv1. diff --git a/frontend/assets/templates/bgpmap.tpl b/frontend/assets/templates/bgpmap.tpl index 8872a60..d6e268b 100644 --- a/frontend/assets/templates/bgpmap.tpl +++ b/frontend/assets/templates/bgpmap.tpl @@ -1,4 +1,4 @@ -

BGPmap: {{ html .Target }}

+

BGPmap{{ html .Target }}

diff --git a/frontend/assets/templates/bird.tpl b/frontend/assets/templates/bird.tpl index 546d3c5..e2d6558 100644 --- a/frontend/assets/templates/bird.tpl +++ b/frontend/assets/templates/bird.tpl @@ -1,2 +1,2 @@ -

{{ html .ServerName }}: {{ html .Target }}

+

{{ html .ServerName }}{{ html .Target }}

{{ .Result }} diff --git a/frontend/assets/templates/page.tpl b/frontend/assets/templates/page.tpl index 94d1ccf..097e377 100644 --- a/frontend/assets/templates/page.tpl +++ b/frontend/assets/templates/page.tpl @@ -12,7 +12,7 @@ -