Change to auth-(users|access), upgrade manually added users to provision users

server/config.go

@@ -95,8 +95,8 @@ type Config struct {
 	AuthFile                             string
 	AuthStartupQueries                   string
 	AuthDefault                          user.Permission
-	AuthProvisionUsers                   []*user.User
-	AuthProvisionAccess                  map[string][]*user.Grant
+	AuthUsers                            []*user.User
+	AuthAccess                           map[string][]*user.Grant
 	AuthBcryptCost                       int
 	AuthStatsQueueWriterInterval         time.Duration
 	AttachmentCacheDir                   string

server/server.go

@@ -201,8 +201,8 @@ func New(conf *Config) (*Server, error) {
 			StartupQueries:      conf.AuthStartupQueries,
 			DefaultAccess:       conf.AuthDefault,
 			ProvisionEnabled:    true, // Enable provisioning of users and access
-			ProvisionUsers:      conf.AuthProvisionUsers,
-			ProvisionAccess:     conf.AuthProvisionAccess,
+			Users:               conf.AuthUsers,
+			Access:              conf.AuthAccess,
 			BcryptCost:          conf.AuthBcryptCost,
 			QueueWriterInterval: conf.AuthStatsQueueWriterInterval,
 		}