Rename env vars prefix to ND_

server/app/app.go

@@ -45,7 +45,7 @@ func (app *Router) routes() http.Handler {
 	r.Post("/login", Login(app.ds))
 
 	r.Route("/api", func(r chi.Router) {
-		if !conf.Sonic.DevDisableAuthentication {
+		if !conf.Server.DevDisableAuthentication {
 			r.Use(jwtauth.Verifier(TokenAuth))
 			r.Use(Authenticator)
 		}

server/initial_setup.go

@@ -53,8 +53,8 @@ func createDefaultUser(ds model.DataStore) error {
 		id, _ := uuid.NewRandom()
 		random, _ := uuid.NewRandom()
 		initialPassword := random.String()
-		if conf.Sonic.DevInitialPassword != "" {
-			initialPassword = conf.Sonic.DevInitialPassword
+		if conf.Server.DevInitialPassword != "" {
+			initialPassword = conf.Server.DevInitialPassword
 		}
 		log.Warn("Creating initial user. Please change the password!", "user", consts.InitialUserName, "password", initialPassword)
 		initialUser := model.User{

server/server.go

@@ -68,9 +68,9 @@ func (a *Server) initRoutes() {
 }
 
 func (a *Server) initScanner() {
-	interval, err := time.ParseDuration(conf.Sonic.ScanInterval)
+	interval, err := time.ParseDuration(conf.Server.ScanInterval)
 	if err != nil {
-		log.Error("Invalid interval specification. Using default of 5m", "conf", conf.Sonic.ScanInterval, err)
+		log.Error("Invalid interval specification. Using default of 5m", "conf", conf.Server.ScanInterval, err)
 		interval = 5 * time.Minute
 	} else {
 		log.Info("Starting scanner", "interval", interval.String())
@@ -80,7 +80,7 @@ func (a *Server) initScanner() {
 		for {
 			err := a.Scanner.RescanAll(false)
 			if err != nil {
-				log.Error("Error scanning media folder", "folder", conf.Sonic.MusicFolder, err)
+				log.Error("Error scanning media folder", "folder", conf.Server.MusicFolder, err)
 			}
 			time.Sleep(interval)
 		}

server/subsonic/api.go

@@ -48,7 +48,7 @@ func (api *Router) routes() http.Handler {
 	r.Use(checkRequiredParameters)
 
 	// Add validation middleware if not disabled
-	if !conf.Sonic.DevDisableAuthentication {
+	if !conf.Server.DevDisableAuthentication {
 		r.Use(authenticate(api.Users))
 		// TODO Validate version
 	}

server/subsonic/browsing.go

@@ -41,7 +41,7 @@ func (c *BrowsingController) getArtistIndex(r *http.Request, ifModifiedSince tim
 	}
 
 	res := &responses.Indexes{
-		IgnoredArticles: conf.Sonic.IgnoredArticles,
+		IgnoredArticles: conf.Server.IgnoredArticles,
 		LastModified:    fmt.Sprint(utils.ToMillis(lastModified)),
 	}