From 58847759b3999a2e57b33400e9aa14c1464b10bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A5=E4=B8=8B=E9=83=A8=20=E8=A9=A9?= Date: Wed, 10 Nov 2021 02:27:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E6=94=B9=E5=8B=95?= =?UTF-8?q?=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1. remove ":" at the start of port assignement. 2. use BIRDLG_PROXY_PORT at proxy. 3. add custom URL to brand * goto / if only one server * add BIRDLG_TRACEROUTE_BIN --- README.md | 8 ++++++-- frontend/assets/templates/page.tpl | 15 +++++++++++++-- frontend/main.go | 28 +++++++++++++++++++++++++++- frontend/render.go | 3 +++ frontend/template.go | 9 ++++++--- proxy/go.mod | 2 +- proxy/main.go | 19 +++++++++++++++++-- proxy/traceroute.go | 10 +++++----- 8 files changed, 78 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index bbe701c..4478cd4 100644 --- a/README.md +++ b/README.md @@ -81,12 +81,15 @@ Usage: all configuration is done via commandline parameters or environment varia | --------- | -------------------- | ----------- | | --servers | BIRDLG_SERVERS | server name prefixes, separated by comma | | --domain | BIRDLG_DOMAIN | server name domain suffixes | -| --listen | BIRDLG_LISTEN | address bird-lg is listening on (default ":5000") | +| --listen | BIRDLG_LISTEN | address bird-lg is listening on (default "5000") | | --proxy-port | BIRDLG_PROXY_PORT | port bird-lgproxy is running on (default 8000) | | --whois | BIRDLG_WHOIS | whois server for queries (default "whois.verisign-grs.com") | | --dns-interface | BIRDLG_DNS_INTERFACE | dns zone to query ASN information (default "asn.cymru.com") | | --title-brand | BIRDLG_TITLE_BRAND | prefix of page titles in browser tabs (default "Bird-lg Go") | | --navbar-brand | BIRDLG_NAVBAR_BRAND | brand to show in the navigation bar (default "Bird-lg Go") | +| --navbar-brand-url | BIRDLG_NAVBAR_BRAND_URL | the url of the brand to show in the navigation bar (default "/") | +| --navbar-all-servers | BIRDLG_NAVBAR_ALL_SERVERS | the text of "All servers" button in the navigation bar (default "ALL Servers") | +| --navbar-all-url | BIRDLG_NAVBAR_ALL_URL | the URL of "All servers" button (default "all") | | --net-specific-mode | BIRDLG_NET_SPECIFIC_MODE | apply network-specific changes for some networks, use "dn42" for BIRD in dn42 network | | --protocol-filter | BIRDLG_PROTOCOL_FILTER | protocol types to show in summary tables (comma separated list); defaults to all if not set | @@ -130,7 +133,8 @@ Usage: all configuration is done via commandline parameters or environment varia | --------- | -------------------- | ----------- | | --allowed | ALLOWED_IPS | IPs allowed to access this proxy, separated by commas. Don't set to allow all IPs. (default "") | | --bird | BIRD_SOCKET | socket file for bird, set either in parameter or environment variable BIRD_SOCKET (default "/var/run/bird/bird.ctl") | -| --listen | BIRDLG_LISTEN | listen address, set either in parameter or environment variable BIRDLG_LISTEN (default ":8000") | +| --listen | BIRDLG_PROXY_PORT | listen address, set either in parameter or environment variable BIRDLG_PROXY_PORT(default "8000") | +| --traceroute_bin | BIRDLG_TRACEROUTE_BIN | traceroute binary file, set either in parameter or environment variable BIRDLG_TRACEROUTE_BIN(default "traceroute") | Example: start proxy with default configuration, should work "out of the box" on Debian 9 with BIRDv1: diff --git a/frontend/assets/templates/page.tpl b/frontend/assets/templates/page.tpl index aef968f..045f3dd 100644 --- a/frontend/assets/templates/page.tpl +++ b/frontend/assets/templates/page.tpl @@ -12,7 +12,7 @@