Merge branch 'main' into feat/shoutrrr

Author: kmendell

backend/internal/bootstrap/jobs_bootstrap.go

@@ -45,12 +45,13 @@ func registerJobs(appCtx context.Context, scheduler *job.Scheduler, appServices
 		slog.ErrorContext(appCtx, "Failed to register event cleanup job", "error", err)
 	}
 
-	if err := job.RegisterFilesystemWatcherJob(appCtx, scheduler, appServices.Project, appServices.Template, appServices.Settings); err != nil {
+	fsWatcherJob, err := job.RegisterFilesystemWatcherJob(appCtx, scheduler, appServices.Project, appServices.Template, appServices.Settings)
+	if err != nil {
 		slog.ErrorContext(appCtx, "Failed to register filesystem watcher job", "error", err)
 	}
 
 	setupJobScheduleCallbacks(appServices, appConfig, environmentHealthJob, analyticsJob, eventCleanupJob)
-	setupSettingsCallbacks(appServices, appConfig, imagePollingJob, autoUpdateJob, environmentHealthJob)
+	setupSettingsCallbacks(appServices, appConfig, imagePollingJob, autoUpdateJob, environmentHealthJob, fsWatcherJob)
 }
 
 func setupJobScheduleCallbacks(appServices *Services, appConfig *config.Config, environmentHealthJob *job.EnvironmentHealthJob, analyticsJob *job.AnalyticsJob, eventCleanupJob *job.EventCleanupJob) {
@@ -71,7 +72,7 @@ func setupJobScheduleCallbacks(appServices *Services, appConfig *config.Config,
 	}
 }
 
-func setupSettingsCallbacks(appServices *Services, appConfig *config.Config, imagePollingJob *job.ImagePollingJob, autoUpdateJob *job.AutoUpdateJob, environmentHealthJob *job.EnvironmentHealthJob) {
+func setupSettingsCallbacks(appServices *Services, appConfig *config.Config, imagePollingJob *job.ImagePollingJob, autoUpdateJob *job.AutoUpdateJob, environmentHealthJob *job.EnvironmentHealthJob, fsWatcherJob *job.FilesystemWatcherJob) {
 	appServices.Settings.OnImagePollingSettingsChanged = func(ctx context.Context) {
 		if err := imagePollingJob.Reschedule(ctx); err != nil {
 			slog.WarnContext(ctx, "Failed to reschedule image-polling job", "error", err)
@@ -90,4 +91,11 @@ func setupSettingsCallbacks(appServices *Services, appConfig *config.Config, ima
 			slog.WarnContext(ctx, "Failed to reschedule auto-update job", "error", err)
 		}
 	}
+	appServices.Settings.OnProjectsDirectoryChanged = func(ctx context.Context) {
+		if fsWatcherJob != nil {
+			if err := fsWatcherJob.RestartProjectsWatcher(ctx); err != nil {
+				slog.WarnContext(ctx, "Failed to restart projects filesystem watcher", "error", err)
+			}
+		}
+	}
 }

backend/internal/job/filesystem_watcher_job.go

@@ -30,7 +30,7 @@ func NewFilesystemWatcherJob(
 	}
 }
 
-func RegisterFilesystemWatcherJob(ctx context.Context, scheduler *Scheduler, projectService *services.ProjectService, templateService *services.TemplateService, settingsService *services.SettingsService) error {
+func RegisterFilesystemWatcherJob(ctx context.Context, scheduler *Scheduler, projectService *services.ProjectService, templateService *services.TemplateService, settingsService *services.SettingsService) (*FilesystemWatcherJob, error) {
 	job := NewFilesystemWatcherJob(projectService, templateService, settingsService)
 
 	go func() {
@@ -40,7 +40,7 @@ func RegisterFilesystemWatcherJob(ctx context.Context, scheduler *Scheduler, pro
 	}()
 
 	slog.InfoContext(ctx, "Filesystem watcher job registered")
-	return nil
+	return job, nil
 }
 
 func (j *FilesystemWatcherJob) Start(ctx context.Context) error {
@@ -153,3 +153,50 @@ func (j *FilesystemWatcherJob) handleTemplatesChange(ctx context.Context) {
 		slog.InfoContext(ctx, "Template sync completed after filesystem change")
 	}
 }
+
+func (j *FilesystemWatcherJob) RestartProjectsWatcher(ctx context.Context) error {
+	slog.InfoContext(ctx, "Restarting projects filesystem watcher")
+
+	// Stop the existing projects watcher if it exists
+	if j.projectsWatcher != nil {
+		if err := j.projectsWatcher.Stop(); err != nil {
+			slog.WarnContext(ctx, "Failed to stop projects watcher during restart", "error", err)
+		}
+	}
+
+	// Get fresh settings to get the new projects directory
+	settings, err := j.settingsService.GetSettings(ctx)
+	if err != nil {
+		return err
+	}
+	projectsDirectory, err := fs.GetProjectsDirectory(ctx, settings.ProjectsDirectory.Value)
+	if err != nil {
+		return err
+	}
+
+	// Create a new watcher with the updated path
+	sw, err := utils.NewFilesystemWatcher(projectsDirectory, utils.WatcherOptions{
+		Debounce: 3 * time.Second,
+		OnChange: j.handleFilesystemChange,
+		MaxDepth: 1,
+	})
+	if err != nil {
+		return err
+	}
+
+	j.projectsWatcher = sw
+
+	// Start the new watcher
+	if err := j.projectsWatcher.Start(ctx); err != nil {
+		return err
+	}
+
+	slog.InfoContext(ctx, "Projects filesystem watcher restarted", "path", projectsDirectory)
+
+	// Perform a sync to ensure we have the latest state from the new directory
+	if err := j.projectService.SyncProjectsFromFileSystem(ctx); err != nil {
+		slog.ErrorContext(ctx, "Initial project sync after watcher restart failed", "error", err)
+	}
+
+	return nil
+}

backend/internal/models/settings.go

@@ -44,7 +44,7 @@ func (s SettingVariable) AsDurationSeconds() time.Duration {
 
 type Settings struct {
 	// General category
-	ProjectsDirectory         SettingVariable `key:"projectsDirectory" meta:"label=Projects Directory;type=text;keywords=projects,directory,path,folder,location,storage,files,compose,docker-compose;category=internal;description=Configure where project files are stored"`
+	ProjectsDirectory         SettingVariable `key:"projectsDirectory,envOverride" meta:"label=Projects Directory;type=text;keywords=projects,directory,path,folder,location,storage,files,compose,docker-compose;category=internal;description=Configure where project files are stored"`
 	DiskUsagePath             SettingVariable `key:"diskUsagePath" meta:"label=Disk Usage Path;type=text;keywords=disk,usage,path,storage,folder,files;category=general;description=Path used for disk usage calculations"`
 	BaseServerURL             SettingVariable `key:"baseServerUrl" meta:"label=Base Server URL;type=text;keywords=base,url,server,domain,host,endpoint,address,link;category=general;description=Set the base URL for the application"`
 	EnableGravatar            SettingVariable `key:"enableGravatar" meta:"label=Enable Gravatar;type=boolean;keywords=gravatar,avatar,profile,picture,image,user,photo;category=general;description=Enable Gravatar profile pictures for users"`

backend/internal/services/settings_service.go

@@ -10,6 +10,7 @@ import (
 	"log/slog"
 	"os"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"sync/atomic"
@@ -31,6 +32,7 @@ type SettingsService struct {
 
 	OnImagePollingSettingsChanged func(ctx context.Context)
 	OnAutoUpdateSettingsChanged   func(ctx context.Context)
+	OnProjectsDirectoryChanged    func(ctx context.Context)
 }
 
 func NewSettingsService(ctx context.Context, db *database.DB) (*SettingsService, error) {
@@ -431,6 +433,9 @@ func (s *SettingsService) UpdateSettings(ctx context.Context, updates settings.U
 	if changedAutoUpdate && s.OnAutoUpdateSettingsChanged != nil {
 		s.OnAutoUpdateSettingsChanged(ctx)
 	}
+	if slices.ContainsFunc(valuesToUpdate, func(sv models.SettingVariable) bool { return sv.Key == "projectsDirectory" }) && s.OnProjectsDirectoryChanged != nil {
+		s.OnProjectsDirectoryChanged(ctx)
+	}
 
 	return settings.ToSettingVariableSlice(false, false), nil
 }
@@ -586,13 +591,21 @@ func (s *SettingsService) EnsureDefaultSettings(ctx context.Context) error {
 
 func (s *SettingsService) PersistEnvSettingsIfMissing(ctx context.Context) error {
 	rt := reflect.TypeOf(models.Settings{})
+	appCfg := config.Load()
+	isEnvOnlyMode := appCfg.AgentMode || appCfg.UIConfigurationDisabled
 
 	if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		for i := 0; i < rt.NumField(); i++ {
 			field := rt.Field(i)
-			key, attrs, _ := strings.Cut(field.Tag.Get("key"), ",")
+			tag := field.Tag.Get("key")
+			key, attrs, _ := strings.Cut(tag, ",")
+
+			if key == "" || strings.Contains(attrs, "internal") {
+				continue
+			}
 
-			if key == "" || attrs == "internal" {
+			// If not in env-only mode, only persist if it's explicitly marked as envOverride
+			if !isEnvOnlyMode && !strings.Contains(attrs, "envOverride") {
 				continue
 			}
 

backend/internal/utils/bootstrap_util.go

@@ -42,12 +42,10 @@ func InitializeDefaultSettings(ctx context.Context, cfg *config.Config, settings
 		slog.InfoContext(ctx, "Default settings initialized successfully")
 	}
 
-	if cfg.AgentMode || cfg.UIConfigurationDisabled {
-		if err := settingsMgr.PersistEnvSettingsIfMissing(ctx); err != nil {
-			slog.WarnContext(ctx, "Failed to persist env-driven settings", "error", err.Error())
-		} else {
-			slog.DebugContext(ctx, "Persisted env-driven settings if missing")
-		}
+	if err := settingsMgr.PersistEnvSettingsIfMissing(ctx); err != nil {
+		slog.WarnContext(ctx, "Failed to persist env-driven settings", "error", err.Error())
+	} else {
+		slog.DebugContext(ctx, "Persisted env-driven settings")
 	}
 }