Browse Source
Merge pull request #1650 from kmlebedev/masterServerEnableUI
security master use access.ui
pull/1681/head
Chris Lu
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
7 deletions
-
docker/local-registry-compose.yml
-
weed/server/master_server.go
|
|
|
@ -13,10 +13,6 @@ services: |
|
|
|
- 8080:8080 |
|
|
|
- 18080:18080 |
|
|
|
command: "volume -mserver=master:9333 -port=8080 -ip=volume -max=0 -preStopSeconds=1" |
|
|
|
volumes: |
|
|
|
- type: bind |
|
|
|
source: /Volumes/mobile_disk/data |
|
|
|
target: /data |
|
|
|
depends_on: |
|
|
|
- master |
|
|
|
filer: |
|
|
|
|
|
|
|
@ -108,10 +108,10 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers []string) *Maste |
|
|
|
|
|
|
|
ms.guard = security.NewGuard(ms.option.WhiteList, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec) |
|
|
|
|
|
|
|
if !ms.option.DisableHttp { |
|
|
|
handleStaticResources2(r) |
|
|
|
r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) |
|
|
|
r.HandleFunc("/ui/index.html", ms.uiStatusHandler) |
|
|
|
if !ms.option.DisableHttp { |
|
|
|
r.HandleFunc("/dir/assign", ms.proxyToLeader(ms.guard.WhiteList(ms.dirAssignHandler))) |
|
|
|
r.HandleFunc("/dir/lookup", ms.guard.WhiteList(ms.dirLookupHandler)) |
|
|
|
r.HandleFunc("/dir/status", ms.proxyToLeader(ms.guard.WhiteList(ms.dirStatusHandler))) |
|
|
|
|
