feat: Allow each individual mount config and serve config entry to override its own env vars

Author: iPromKnight

compose.yaml

@@ -1,6 +1,5 @@
 services:
   rclone-manager:
-    image: ipromknight/rclone-manager:latest
     container_name: rclone-manager
     restart: unless-stopped
     stop_signal: SIGTERM
@@ -22,15 +21,18 @@ services:
     environment:
       # General
       RCLONE_BUFFER_SIZE: 0
-      RCLONE_BWLIMIT: 100M
+      RCLONE_BWLIMIT: off
       RCLONE_BIND: 0.0.0.0
-      RCLONE_LOG_LEVEL: INFO
+      RCLONE_LOG_LEVEL: Info
       RCLONE_CACHE_DIR: /caches/rclone
       RCLONE_DIR_CACHE_TIME: 10s
       RCLONE_TIMEOUT: 10m
       RCLONE_UMASK: 002
       RCLONE_UID: 1000
       RCLONE_GID: 1000
+      RCLONE_LINKS: true
+      RCLONE_MULTI_THREAD_STREAMS: 1
+      RCLONE_TRANSFERS: 1
       RCLONE_ALLOW_NON_EMPTY: "true"
       RCLONE_ALLOW_OTHER: "true"
       RCLONE_CONFIG: /data/rclone.conf
@@ -42,12 +44,9 @@ services:
       RCLONE_RC_WEB_GUI_NO_OPEN_BROWSER: "true"
 
       # VFS DEFAULTS
-      RCLONE_VFS_MIN_FREE_SPACE: off
-      RCLONE_VFS_CACHE_MAX_AGE: 24h
-      RCLONE_VFS_MAX_CACHE_SIZE: 100G
       RCLONE_VFS_CACHE_MODE: writes
-      RCLONE_VFS_READ_CHUNK_LIMIT: 64M
-      RCLONE_VFS_READ_CHUNK_SIZE: 5M
+      RCLONE_VFS_READ_CHUNK_SIZE: 10M
+      RCLONE_VFS_READ_CHUNK_SIZE_LIMIT: 10M
 
       # MOUNT DEFAULTS
       RCLONE_NO_TRAVERSE: "true"

config.yaml

@@ -1,8 +1,28 @@
 mounts:
   - backendName: "AllDebrid"
     mountPoint: "/mnt/rclone/alldebrid"
+    environment:
+      RCLONE_BWLIMIT: off
+      RCLONE_READ_ONLY: true
+      RCLONE_VFS_READ_CHUNK_SIZE: 16M
+      RCLONE_VFS_READ_CHUNK_SIZE_LIMIT: 32M
 
 serves:
   - backendName: "AllDebrid"
     protocol: "webdav"
     addr: "0.0.0.0:8080"
+    environment:
+      RCLONE_BUFFER_SIZE: 0
+      RCLONE_BWLIMIT: 300M
+      RCLONE_COPY_LINKS: true
+      RCLONE_LINKS: false
+      RCLONE_MAX_HEADER_SIZE: 8192
+      RCLONE_VFS_READ_CHUNK_SIZE: 16M
+      RCLONE_VFS_READ_CHUNK_SIZE_LIMIT: 32M
+      RCLONE_STATS: 60s
+      RCLONE_VFS_CACHE_MODE: writes
+      RCLONE_CUTOFF_MODE: cautious
+      RCLONE_MULTI_THREAD_STREAMS: 0
+      RCLONE_DIR_CACHE_TIME: 10s
+      RCLONE_NO_MODTIME: true
+      RCLONE_READ_ONLY: true

src/internal/config/config.go

@@ -8,14 +8,16 @@ import (
 
 type Config struct {
 	Serves []struct {
-		BackendName string `yaml:"backendName"`
-		Protocol    string `yaml:"protocol"`
-		Addr        string `yaml:"addr"`
+		BackendName string            `yaml:"backendName"`
+		Protocol    string            `yaml:"protocol"`
+		Addr        string            `yaml:"addr"`
+		Environment map[string]string `yaml:"environment,omitempty"`
 	} `yaml:"serves"`
 
 	Mounts []struct {
-		BackendName string `yaml:"backendName"`
-		MountPoint  string `yaml:"mountPoint"`
+		BackendName string            `yaml:"backendName"`
+		MountPoint  string            `yaml:"mountPoint"`
+		Environment map[string]string `yaml:"environment,omitempty"`
 	} `yaml:"mounts"`
 }
 

src/internal/environment/environment.go

@@ -0,0 +1,47 @@
+package environment
+
+import (
+	"fmt"
+	"os"
+	"strings"
+)
+
+func PrepareEnvironment(envVars map[string]string) []string {
+	if envVars == nil {
+		return os.Environ()
+	}
+
+	envMap := make(map[string]string)
+
+	for _, env := range os.Environ() {
+		parts := splitEnv(env)
+		envMap[parts[0]] = parts[1]
+	}
+
+	for key, value := range envVars {
+		envMap[key] = value
+	}
+
+	return mapToSlice(envMap)
+}
+
+func splitEnv(env string) []string {
+	parts := make([]string, 2)
+	idx := strings.Index(env, "=")
+	if idx != -1 {
+		parts[0] = env[:idx]
+		parts[1] = env[idx+1:]
+	} else {
+		parts[0] = env
+		parts[1] = ""
+	}
+	return parts
+}
+
+func mapToSlice(envMap map[string]string) []string {
+	var env []string
+	for k, v := range envMap {
+		env = append(env, fmt.Sprintf("%s=%s", k, v))
+	}
+	return env
+}

src/internal/mount_manager/helpers.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"rclone-manager/internal/config"
 	"rclone-manager/internal/constants"
+	"rclone-manager/internal/environment"
 	"syscall"
 )
 
@@ -34,6 +35,9 @@ func createMountCommand(instance *MountedEndpoint) *exec.Cmd {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+
+	cmd.Env = environment.PrepareEnvironment(instance.EnvVars)
+
 	return cmd
 }
 
@@ -81,6 +85,7 @@ func setupMountsFromConfig(conf *config.Config, logger zerolog.Logger) {
 		instance := &MountedEndpoint{
 			BackendName: mount.BackendName,
 			MountPoint:  mount.MountPoint,
+			EnvVars:     mount.Environment,
 		}
 		if existing, ok := getMountedEndpoint(mount.BackendName); ok {
 			if existing.MountPoint != instance.MountPoint {

src/internal/mount_manager/mount.go

@@ -15,6 +15,7 @@ var (
 type MountedEndpoint struct {
 	BackendName string
 	MountPoint  string
+	EnvVars     map[string]string
 }
 
 func InitializeMounts(conf *config.Config, logger zerolog.Logger, processLock *sync.Mutex) {
@@ -31,6 +32,7 @@ func InitializeMounts(conf *config.Config, logger zerolog.Logger, processLock *s
 		instance := &MountedEndpoint{
 			BackendName: mount.BackendName,
 			MountPoint:  mount.MountPoint,
+			EnvVars:     mount.Environment,
 		}
 		StartMountWithRetries(instance, logger)
 	}

src/internal/serve_manager/helpers.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"rclone-manager/internal/config"
 	"rclone-manager/internal/constants"
+	"rclone-manager/internal/environment"
 )
 
 func getServeInstance(key string) (*ServeProcess, bool) {
@@ -25,6 +26,8 @@ func createServeCommand(instance *ServeProcess) *exec.Cmd {
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
+	cmd.Env = environment.PrepareEnvironment(instance.EnvVars)
+
 	return cmd
 }
 
@@ -42,6 +45,7 @@ func setupServesFromConfig(conf *config.Config, logger zerolog.Logger) {
 			Backend:  serve.BackendName,
 			Protocol: serve.Protocol,
 			Addr:     serve.Addr,
+			EnvVars:  serve.Environment,
 		}
 		if existing, ok := getServeInstance(serve.BackendName); ok {
 			if existing.Protocol != serve.Protocol || existing.Addr != serve.Addr {

src/internal/serve_manager/monitor.go

@@ -42,6 +42,7 @@ func MonitorServeProcesses(logger zerolog.Logger) {
 					Backend:  serveProcess.Backend,
 					Protocol: serveProcess.Protocol,
 					Addr:     serveProcess.Addr,
+					EnvVars:  serveProcess.EnvVars,
 				}
 
 				newProcess := StartServeWithRetries(newServe, logger)

src/internal/serve_manager/serve.go

@@ -17,6 +17,7 @@ type ServeProcess struct {
 	Addr        string
 	StartedAt   time.Time
 	GracePeriod time.Duration
+	EnvVars     map[string]string
 }
 
 var (
@@ -38,6 +39,7 @@ func InitializeServeEndpoints(conf *config.Config, logger zerolog.Logger, proces
 			Backend:  serve.BackendName,
 			Protocol: serve.Protocol,
 			Addr:     serve.Addr,
+			EnvVars:  serve.Environment,
 		}
 		StartServeWithRetries(instance, logger)
 	}