diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-12-14 00:31:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 00:31:51 -0800 |
| commit | b7e3ca91727d6ad12f99aa7fd18ad23e13875f6c (patch) | |
| tree | 2da6a85e6fec8d006f54aad84a1de2239a74ff70 | |
| parent | 021358749bbce20a6d2563506e9f905ef041d8cc (diff) | |
| parent | c4459249efedb117cb66fbdbd8df87ec3d995865 (diff) | |
| download | seaweedfs-b7e3ca91727d6ad12f99aa7fd18ad23e13875f6c.tar.xz seaweedfs-b7e3ca91727d6ad12f99aa7fd18ad23e13875f6c.zip | |
Merge pull request #1650 from kmlebedev/masterServerEnableUI
security master use access.ui
| -rw-r--r-- | docker/local-registry-compose.yml | 4 | ||||
| -rw-r--r-- | weed/server/master_server.go | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/docker/local-registry-compose.yml b/docker/local-registry-compose.yml index da86b4d74..7f3672cd0 100644 --- a/docker/local-registry-compose.yml +++ b/docker/local-registry-compose.yml @@ -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: diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 24a5d61b1..9404081b4 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -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) + handleStaticResources2(r) + r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) + r.HandleFunc("/ui/index.html", ms.uiStatusHandler) if !ms.option.DisableHttp { - handleStaticResources2(r) - r.HandleFunc("/", ms.proxyToLeader(ms.uiStatusHandler)) - r.HandleFunc("/ui/index.html", ms.uiStatusHandler) 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))) |