Просмотр исходного кода

Merge pull request #1650 from kmlebedev/masterServerEnableUI

security master use access.ui
Chris Lu 4 лет назад
Родитель
Сommit
b7e3ca9172
2 измененных файлов с 3 добавлено и 7 удалено
  1. 0 4
      docker/local-registry-compose.yml
  2. 3 3
      weed/server/master_server.go

+ 0 - 4
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:

+ 3 - 3
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)))