Config: Code clean-up

Signed-off-by: Michael Mayer <michael@photoprism.app>

frontend/src/component/footer.vue

@@ -3,13 +3,13 @@
     <v-card-actions class="footer-actions">
       <v-layout wrap align-top pt-3>
         <v-flex xs12 sm6 class="px-0 pb-2 body-1 text-selectable text-xs-left">
-          <strong><router-link to="/about" class="text-link">{{ $config.getAbout() }}</router-link></strong>
+          <strong><router-link to="/about" class="text-link">{{ about }}</router-link></strong>
           <span class="body-link text-selectable">Build&nbsp;<a href="https://docs.photoprism.app/release-notes/" target="_blank" :title="version" class="body-link">{{ build }}</a></span>
         </v-flex>
 
         <v-flex xs12 sm6 class="px-0 pb-2 body-1 text-xs-center text-sm-right">
           <div class="hidden-xs-only">
-            <a v-if="nonCommercial" href="https://raw.githubusercontent.com/photoprism/photoprism/develop/NOTICE"
+            <a v-if="evaluation" href="https://raw.githubusercontent.com/photoprism/photoprism/develop/NOTICE"
                target="_blank" class="text-link">3rd-party software packages</a>
             <a v-else href="https://my.photoprism.app/" target="_blank" class="text-link">Licensed to {{ customer }}</a>
             <a href="https://www.photoprism.app/team/" target="_blank" class="body-link">© 2018-2023 PhotoPrism UG</a>
@@ -26,16 +26,18 @@ export default {
   data() {
     const ver = this.$config.getVersion().split("-");
     const build = ver.slice(0, 2).join("-");
+    const about = this.$config.getAbout();
     const customer = this.$config.get("customer");
-    const nonCommercial = !customer;
+    const evaluation = !customer;
 
     return {
       rtl: this.$rtl,
       build: build,
+      about: about,
       version: this.$config.getVersion(),
       sponsor: this.$config.isSponsor(),
       customer: customer,
-      nonCommercial: nonCommercial,
+      evaluation: evaluation,
     };
   },
   methods: {},

internal/commands/start.go

@@ -9,8 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/photoprism/photoprism/pkg/report"
-
 	"github.com/sevlyar/go-daemon"
 	"github.com/urfave/cli"
 
@@ -22,6 +20,7 @@ import (
 	"github.com/photoprism/photoprism/internal/workers"
 	"github.com/photoprism/photoprism/pkg/clean"
 	"github.com/photoprism/photoprism/pkg/fs"
+	"github.com/photoprism/photoprism/pkg/report"
 )
 
 // StartCommand configures the command name, flags, and action.

internal/config/about.go

@@ -23,3 +23,10 @@ Additional information can be found in our Developer Guide:
 <https://docs.photoprism.app/developer-guide/>
 */
 package config
+
+// MsgSponsor provides membership information.
+var MsgSponsor = "Upgrade now to support our mission! 💎"
+var SignUpURL = "https://www.photoprism.app/editions"
+var MsgSignUp = "Visit " + SignUpURL + " to learn more."
+var MsgSponsorCommand = "Since running this command puts additional load on our infrastructure," +
+	" we unfortunately can only offer it to sponsors."

internal/config/config_const.go

@@ -11,14 +11,6 @@ const StaticUri = "/static"
 // CustomStaticUri is the relative path for serving custom static content.
 const CustomStaticUri = "/c/static"
 
-// MsgSponsor and MsgSignUp provide sponsorship info messages;
-// SignUpURL a signup link.
-const MsgSponsor = "PhotoPrism® needs your support!"
-const SignUpURL = "https://www.photoprism.app/membership"
-const MsgSignUp = "Visit " + SignUpURL + " to learn more."
-const MsgSponsorCommand = "Since running this command puts additional load on our infrastructure," +
-	" we unfortunately can only offer it to sponsors."
-
 // DefaultAutoIndexDelay and DefaultAutoImportDelay set the default safety delay duration
 // before starting to index/import in the background.
 const DefaultAutoIndexDelay = int(5 * 60)  // 5 Minutes

internal/config/env.go

@@ -17,10 +17,15 @@ const (
 	EnvTest    = "test"
 )
 
+// EnvVar returns the name of the environment variable for the specified config flag.
+func EnvVar(flag string) string {
+	return "PHOTOPRISM_" + strings.ToUpper(strings.ReplaceAll(flag, "-", "_"))
+}
+
 // Env checks the presence of environment and command-line flags.
 func Env(vars ...string) bool {
 	for _, s := range vars {
-		if os.Getenv("PHOTOPRISM_"+strings.ToUpper(s)) == "true" || list.Contains(os.Args, "--"+s) {
+		if os.Getenv(EnvVar(s)) == "true" || list.Contains(os.Args, "--"+s) {
 			return true
 		}
 	}

internal/config/env_test.go

@@ -6,6 +6,15 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func TestEnvVar(t *testing.T) {
+	t.Run("Test", func(t *testing.T) {
+		assert.Equal(t, "PHOTOPRISM_TEST", EnvVar(EnvTest))
+	})
+	t.Run("Foo", func(t *testing.T) {
+		assert.Equal(t, "PHOTOPRISM_FOO", EnvVar("foo"))
+	})
+}
+
 func TestEnv(t *testing.T) {
 	t.Run("True", func(t *testing.T) {
 		assert.True(t, Env(EnvTest))

internal/config/flags.go

@@ -3,13 +3,12 @@ package config
 import (
 	"fmt"
 
-	"github.com/photoprism/photoprism/internal/ffmpeg"
-
 	"github.com/klauspost/cpuid/v2"
 	"github.com/urfave/cli"
 
 	"github.com/photoprism/photoprism/internal/entity"
 	"github.com/photoprism/photoprism/internal/face"
+	"github.com/photoprism/photoprism/internal/ffmpeg"
 	"github.com/photoprism/photoprism/internal/i18n"
 	"github.com/photoprism/photoprism/internal/server/header"
 	"github.com/photoprism/photoprism/internal/thumb"
@@ -22,58 +21,58 @@ var Flags = CliFlags{
 			Name:   "auth-mode, a",
 			Usage:  "authentication `MODE` (public, password)",
 			Value:  "password",
-			EnvVar: "PHOTOPRISM_AUTH_MODE",
+			EnvVar: EnvVar("AUTH_MODE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "public, p",
 			Hidden: true,
 			Usage:  "disable authentication, advanced settings, and WebDAV remote access",
-			EnvVar: "PHOTOPRISM_PUBLIC",
+			EnvVar: EnvVar("PUBLIC"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "admin-user, login",
 			Usage:  "superadmin `USERNAME`",
-			EnvVar: "PHOTOPRISM_ADMIN_USER",
 			Value:  "admin",
+			EnvVar: EnvVar("ADMIN_USER"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "admin-password, pw",
 			Usage:  fmt.Sprintf("initial superadmin `PASSWORD` (minimum %d characters)", entity.PasswordLength),
-			EnvVar: "PHOTOPRISM_ADMIN_PASSWORD",
+			EnvVar: EnvVar("ADMIN_PASSWORD"),
 		}}, {
 		Flag: cli.Int64Flag{
 			Name:   "session-maxage",
 			Value:  DefaultSessionMaxAge,
 			Usage:  "time in `SECONDS` until API sessions expire automatically (-1 to disable)",
-			EnvVar: "PHOTOPRISM_SESSION_MAXAGE",
+			EnvVar: EnvVar("SESSION_MAXAGE"),
 		}}, {
 		Flag: cli.Int64Flag{
 			Name:   "session-timeout",
 			Value:  DefaultSessionTimeout,
 			Usage:  "time in `SECONDS` until API sessions expire due to inactivity (-1 to disable)",
-			EnvVar: "PHOTOPRISM_SESSION_TIMEOUT",
+			EnvVar: EnvVar("SESSION_TIMEOUT"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "log-level, l",
 			Usage:  "log message verbosity `LEVEL` (trace, debug, info, warning, error, fatal, panic)",
 			Value:  "info",
-			EnvVar: "PHOTOPRISM_LOG_LEVEL",
+			EnvVar: EnvVar("LOG_LEVEL"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "prod",
 			Hidden: true,
 			Usage:  "enable production mode, hide non-essential log messages",
-			EnvVar: "PHOTOPRISM_PROD",
+			EnvVar: EnvVar("PROD"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "debug",
 			Usage:  "enable debug mode, show non-essential log messages",
-			EnvVar: "PHOTOPRISM_DEBUG",
+			EnvVar: EnvVar("DEBUG"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "trace",
 			Usage:  "enable trace mode, show all log messages",
-			EnvVar: "PHOTOPRISM_TRACE",
+			EnvVar: EnvVar("TRACE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "test",
@@ -84,284 +83,284 @@ var Flags = CliFlags{
 			Name:   "unsafe",
 			Hidden: true,
 			Usage:  "disable safety checks",
-			EnvVar: "PHOTOPRISM_UNSAFE",
+			EnvVar: EnvVar("UNSAFE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "demo",
 			Hidden: true,
 			Usage:  "enable demo mode",
-			EnvVar: "PHOTOPRISM_DEMO",
+			EnvVar: EnvVar("DEMO"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "sponsor",
 			Hidden: true,
 			Usage:  "your continuous support helps to pay for development and operating expenses",
-			EnvVar: "PHOTOPRISM_SPONSOR",
+			EnvVar: EnvVar("SPONSOR"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "partner-id",
 			Hidden: true,
 			Usage:  "hosting partner id",
-			EnvVar: "PHOTOPRISM_PARTNER_ID",
+			EnvVar: EnvVar("PARTNER_ID"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "config-path, c",
 			Usage:  "config storage `PATH`, values in options.yml override CLI flags and environment variables if present",
-			EnvVar: "PHOTOPRISM_CONFIG_PATH",
+			EnvVar: EnvVar("CONFIG_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "defaults-yaml, y",
 			Usage:  "load config defaults from `FILE` if exists, does not override CLI flags and environment variables",
 			Value:  "/etc/photoprism/defaults.yml",
-			EnvVar: "PHOTOPRISM_DEFAULTS_YAML",
+			EnvVar: EnvVar("DEFAULTS_YAML"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "originals-path, o",
 			Usage:  "storage `PATH` of your original media files (photos and videos)",
-			EnvVar: "PHOTOPRISM_ORIGINALS_PATH",
+			EnvVar: EnvVar("ORIGINALS_PATH"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "originals-limit, mb",
 			Value:  1000,
 			Usage:  "maximum size of media files in `MB` (1-100000; -1 to disable)",
-			EnvVar: "PHOTOPRISM_ORIGINALS_LIMIT",
+			EnvVar: EnvVar("ORIGINALS_LIMIT"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "resolution-limit, mp",
 			Value:  DefaultResolutionLimit,
 			Usage:  "maximum resolution of media files in `MEGAPIXELS` (1-900; -1 to disable)",
-			EnvVar: "PHOTOPRISM_RESOLUTION_LIMIT",
+			EnvVar: EnvVar("RESOLUTION_LIMIT"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "users-path",
 			Usage:  "relative `PATH` to create base and upload subdirectories for users",
-			EnvVar: "PHOTOPRISM_USERS_PATH",
 			Value:  "users",
+			EnvVar: EnvVar("USERS_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "storage-path, s",
 			Usage:  "writable storage `PATH` for sidecar, cache, and database files",
-			EnvVar: "PHOTOPRISM_STORAGE_PATH",
+			EnvVar: EnvVar("STORAGE_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "sidecar-path, sc",
 			Usage:  "custom relative or absolute sidecar `PATH` *optional*",
-			EnvVar: "PHOTOPRISM_SIDECAR_PATH",
+			EnvVar: EnvVar("SIDECAR_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "backup-path, ba",
 			Usage:  "custom backup `PATH` for index backup files *optional*",
-			EnvVar: "PHOTOPRISM_BACKUP_PATH",
+			EnvVar: EnvVar("BACKUP_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "cache-path, ca",
 			Usage:  "custom cache `PATH` for sessions and thumbnail files *optional*",
-			EnvVar: "PHOTOPRISM_CACHE_PATH",
+			EnvVar: EnvVar("CACHE_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "import-path, im",
 			Usage:  "base `PATH` from which files can be imported to originals *optional*",
-			EnvVar: "PHOTOPRISM_IMPORT_PATH",
+			EnvVar: EnvVar("IMPORT_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "import-dest",
 			Usage:  "relative originals `PATH` to which the files should be imported by default *optional*",
-			EnvVar: "PHOTOPRISM_IMPORT_DEST",
+			EnvVar: EnvVar("IMPORT_DEST"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "assets-path, as",
 			Usage:  "assets `PATH` containing static resources like icons, models, and translations",
-			EnvVar: "PHOTOPRISM_ASSETS_PATH",
+			EnvVar: EnvVar("ASSETS_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "temp-path, tmp",
 			Usage:  "temporary file `PATH` *optional*",
-			EnvVar: "PHOTOPRISM_TEMP_PATH",
+			EnvVar: EnvVar("TEMP_PATH"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "workers, w",
 			Usage:  "maximum `NUMBER` of indexing workers, default depends on the number of physical cores",
-			EnvVar: "PHOTOPRISM_WORKERS",
 			Value:  cpuid.CPU.PhysicalCores / 2,
+			EnvVar: EnvVar("WORKERS"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "wakeup-interval, i",
 			Usage:  "`DURATION` between worker runs required for face recognition and index maintenance (1-86400s)",
 			Value:  DefaultWakeupInterval.String(),
-			EnvVar: "PHOTOPRISM_WAKEUP_INTERVAL",
+			EnvVar: EnvVar("WAKEUP_INTERVAL"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "auto-index",
 			Usage:  "WebDAV auto index safety delay in `SECONDS` (-1 to disable)",
 			Value:  DefaultAutoIndexDelay,
-			EnvVar: "PHOTOPRISM_AUTO_INDEX",
+			EnvVar: EnvVar("AUTO_INDEX"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "auto-import",
 			Usage:  "WebDAV auto import safety delay in `SECONDS` (-1 to disable)",
 			Value:  DefaultAutoImportDelay,
-			EnvVar: "PHOTOPRISM_AUTO_IMPORT",
+			EnvVar: EnvVar("AUTO_IMPORT"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "read-only, r",
 			Usage:  "disable import, upload, delete, and all other operations that require write permissions",
-			EnvVar: "PHOTOPRISM_READONLY",
+			EnvVar: EnvVar("READONLY"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "experimental, e",
 			Usage:  "enable experimental features",
-			EnvVar: "PHOTOPRISM_EXPERIMENTAL",
+			EnvVar: EnvVar("EXPERIMENTAL"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-webdav",
 			Usage:  "disable built-in WebDAV server",
-			EnvVar: "PHOTOPRISM_DISABLE_WEBDAV",
+			EnvVar: EnvVar("DISABLE_WEBDAV"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-settings",
 			Usage:  "disable settings UI and API",
-			EnvVar: "PHOTOPRISM_DISABLE_SETTINGS",
+			EnvVar: EnvVar("DISABLE_SETTINGS"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-places",
 			Usage:  "disable reverse geocoding and maps",
-			EnvVar: "PHOTOPRISM_DISABLE_PLACES",
+			EnvVar: EnvVar("DISABLE_PLACES"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-backups",
 			Usage:  "disable backing up albums and photo metadata to YAML files",
-			EnvVar: "PHOTOPRISM_DISABLE_BACKUPS",
+			EnvVar: EnvVar("DISABLE_BACKUPS"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-tensorflow",
 			Usage:  "disable all features depending on TensorFlow",
-			EnvVar: "PHOTOPRISM_DISABLE_TENSORFLOW",
+			EnvVar: EnvVar("DISABLE_TENSORFLOW"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-faces",
 			Usage:  "disable face detection and recognition (requires TensorFlow)",
-			EnvVar: "PHOTOPRISM_DISABLE_FACES",
+			EnvVar: EnvVar("DISABLE_FACES"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-classification",
 			Usage:  "disable image classification (requires TensorFlow)",
-			EnvVar: "PHOTOPRISM_DISABLE_CLASSIFICATION",
+			EnvVar: EnvVar("DISABLE_CLASSIFICATION"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-sips",
 			Usage:  "disable conversion of media files with Sips *macOS only*",
-			EnvVar: "PHOTOPRISM_DISABLE_SIPS",
+			EnvVar: EnvVar("DISABLE_SIPS"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-ffmpeg",
 			Usage:  "disable video transcoding and thumbnail extraction with FFmpeg",
-			EnvVar: "PHOTOPRISM_DISABLE_FFMPEG",
+			EnvVar: EnvVar("DISABLE_FFMPEG"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-exiftool",
 			Usage:  "disable creating JSON metadata sidecar files with ExifTool",
-			EnvVar: "PHOTOPRISM_DISABLE_EXIFTOOL",
+			EnvVar: EnvVar("DISABLE_EXIFTOOL"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-darktable",
 			Usage:  "disable conversion of RAW images with Darktable",
-			EnvVar: "PHOTOPRISM_DISABLE_DARKTABLE",
+			EnvVar: EnvVar("DISABLE_DARKTABLE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-rawtherapee",
 			Usage:  "disable conversion of RAW images with RawTherapee",
-			EnvVar: "PHOTOPRISM_DISABLE_RAWTHERAPEE",
+			EnvVar: EnvVar("DISABLE_RAWTHERAPEE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-imagemagick",
 			Usage:  "disable conversion of image files with ImageMagick",
-			EnvVar: "PHOTOPRISM_DISABLE_IMAGEMAGICK",
+			EnvVar: EnvVar("DISABLE_IMAGEMAGICK"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-heifconvert",
 			Usage:  "disable conversion of HEIC images with libheif",
-			EnvVar: "PHOTOPRISM_DISABLE_HEIFCONVERT",
+			EnvVar: EnvVar("DISABLE_HEIFCONVERT"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-jpegxl",
 			Usage:  "disable JPEG XL file format support",
-			EnvVar: "PHOTOPRISM_DISABLE_JPEGXL",
+			EnvVar: EnvVar("DISABLE_JPEGXL"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-raw",
 			Usage:  "disable indexing and conversion of RAW images",
-			EnvVar: "PHOTOPRISM_DISABLE_RAW",
+			EnvVar: EnvVar("DISABLE_RAW"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "raw-presets",
 			Usage:  "enables applying user presets when converting RAW images (reduces performance)",
-			EnvVar: "PHOTOPRISM_RAW_PRESETS",
+			EnvVar: EnvVar("RAW_PRESETS"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "exif-bruteforce",
 			Usage:  "always perform a brute-force search if no Exif headers were found",
-			EnvVar: "PHOTOPRISM_EXIF_BRUTEFORCE",
+			EnvVar: EnvVar("EXIF_BRUTEFORCE"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "detect-nsfw",
 			Usage:  "automatically flag photos as private that MAY be offensive (requires TensorFlow)",
-			EnvVar: "PHOTOPRISM_DETECT_NSFW",
+			EnvVar: EnvVar("DETECT_NSFW"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "upload-nsfw, n",
 			Usage:  "allow uploads that MAY be offensive (no effect without TensorFlow)",
-			EnvVar: "PHOTOPRISM_UPLOAD_NSFW",
+			EnvVar: EnvVar("UPLOAD_NSFW"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "default-locale, lang",
 			Usage:  "standard user interface language `CODE`",
 			Value:  i18n.Default.Locale(),
-			EnvVar: "PHOTOPRISM_DEFAULT_LOCALE",
+			EnvVar: EnvVar("DEFAULT_LOCALE"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "default-theme",
 			Usage:  "standard user interface theme `NAME`",
-			EnvVar: "PHOTOPRISM_DEFAULT_THEME",
+			EnvVar: EnvVar("DEFAULT_THEME"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "app-name",
 			Usage:  "progressive web app `NAME` when installed on a device",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_APP_NAME",
+			EnvVar: EnvVar("APP_NAME"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "app-mode",
 			Usage:  "progressive web app `MODE` (fullscreen, standalone, minimal-ui, browser)",
 			Value:  "standalone",
-			EnvVar: "PHOTOPRISM_APP_MODE",
+			EnvVar: EnvVar("APP_MODE"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "app-icon",
 			Usage:  "home screen `ICON` (logo, app, crisp, mint, bold)",
-			EnvVar: "PHOTOPRISM_APP_ICON",
+			EnvVar: EnvVar("APP_ICON"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "app-color",
 			Usage:  "splash screen `COLOR` code",
-			EnvVar: "PHOTOPRISM_APP_COLOR",
 			Value:  "#000000",
+			EnvVar: EnvVar("APP_COLOR"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "imprint",
 			Usage:  "legal information `TEXT`, displayed in the page footer",
 			Value:  "",
 			Hidden: true,
-			EnvVar: "PHOTOPRISM_IMPRINT",
+			EnvVar: EnvVar("IMPRINT"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "legal-info",
 			Usage:  "legal information `TEXT`, displayed in the page footer",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_LEGAL_INFO",
+			EnvVar: EnvVar("LEGAL_INFO"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
@@ -369,395 +368,395 @@ var Flags = CliFlags{
 			Usage:  "legal information `URL`",
 			Value:  "",
 			Hidden: true,
-			EnvVar: "PHOTOPRISM_IMPRINT_URL",
+			EnvVar: EnvVar("IMPRINT_URL"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "legal-url",
 			Usage:  "legal information `URL`",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_LEGAL_URL",
+			EnvVar: EnvVar("LEGAL_URL"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "wallpaper-uri",
 			Usage:  "login screen background image `URI`",
-			EnvVar: "PHOTOPRISM_WALLPAPER_URI",
 			Value:  "",
+			EnvVar: EnvVar("WALLPAPER_URI"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "cdn-url",
 			Usage:  "content delivery network `URL`",
-			EnvVar: "PHOTOPRISM_CDN_URL",
+			EnvVar: EnvVar("CDN_URL"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-url, url",
 			Usage:  "public site `URL`",
 			Value:  "http://photoprism.me:2342/",
-			EnvVar: "PHOTOPRISM_SITE_URL",
+			EnvVar: EnvVar("SITE_URL"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-author",
 			Usage:  "site `OWNER`, copyright, or artist",
-			EnvVar: "PHOTOPRISM_SITE_AUTHOR",
+			EnvVar: EnvVar("SITE_AUTHOR"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-title",
 			Usage:  "site `TITLE`",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_SITE_TITLE",
+			EnvVar: EnvVar("SITE_TITLE"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-caption",
 			Usage:  "site `CAPTION`",
 			Value:  "AI-Powered Photos App",
-			EnvVar: "PHOTOPRISM_SITE_CAPTION",
+			EnvVar: EnvVar("SITE_CAPTION"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-description",
 			Usage:  "site `DESCRIPTION` *optional*",
-			EnvVar: "PHOTOPRISM_SITE_DESCRIPTION",
+			EnvVar: EnvVar("SITE_DESCRIPTION"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "site-preview",
 			Usage:  "sharing preview image `URL`",
-			EnvVar: "PHOTOPRISM_SITE_PREVIEW",
+			EnvVar: EnvVar("SITE_PREVIEW"),
 		}, Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "https-proxy",
 			Usage:  "proxy server `URL` to be used for outgoing connections *optional*",
-			EnvVar: "PHOTOPRISM_HTTPS_PROXY",
+			EnvVar: EnvVar("HTTPS_PROXY"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "https-proxy-insecure",
 			Usage:  "ignore invalid HTTPS certificates when using a proxy",
-			EnvVar: "PHOTOPRISM_HTTPS_PROXY_INSECURE",
+			EnvVar: EnvVar("HTTPS_PROXY_INSECURE"),
 		}}, {
 		Flag: cli.StringSliceFlag{
 			Name:   "trusted-proxy",
 			Usage:  "`CIDR` range from which reverse proxy headers can be trusted",
 			Value:  &cli.StringSlice{header.CidrDockerInternal},
-			EnvVar: "PHOTOPRISM_TRUSTED_PROXY",
+			EnvVar: EnvVar("TRUSTED_PROXY"),
 		}}, {
 		Flag: cli.StringSliceFlag{
 			Name:   "proxy-proto-header",
 			Usage:  "proxy protocol header `NAME`",
 			Value:  &cli.StringSlice{header.ForwardedProto},
-			EnvVar: "PHOTOPRISM_PROXY_PROTO_HEADER",
+			EnvVar: EnvVar("PROXY_PROTO_HEADER"),
 		}}, {
 		Flag: cli.StringSliceFlag{
 			Name:   "proxy-proto-https",
 			Usage:  "forwarded HTTPS protocol `NAME`",
 			Value:  &cli.StringSlice{header.ProtoHttps},
-			EnvVar: "PHOTOPRISM_PROXY_PROTO_HTTPS",
+			EnvVar: EnvVar("PROXY_PROTO_HTTPS"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "disable-tls",
 			Usage:  "disable HTTPS even if a certificate is available",
-			EnvVar: "PHOTOPRISM_DISABLE_TLS",
+			EnvVar: EnvVar("DISABLE_TLS"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "tls-email",
 			Usage:  "`EMAIL` address to enable automatic HTTPS via Let's Encrypt",
-			EnvVar: "PHOTOPRISM_TLS_EMAIL",
+			EnvVar: EnvVar("TLS_EMAIL"),
 			Hidden: true,
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "tls-cert",
 			Usage:  "public HTTPS certificate `FILE` (.crt)",
-			EnvVar: "PHOTOPRISM_TLS_CERT",
+			EnvVar: EnvVar("TLS_CERT"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "tls-key",
 			Usage:  "private HTTPS key `FILE` (.key)",
-			EnvVar: "PHOTOPRISM_TLS_KEY",
+			EnvVar: EnvVar("TLS_KEY"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "http-mode, mode",
 			Usage:  "Web server `MODE` (debug, release, test)",
-			EnvVar: "PHOTOPRISM_HTTP_MODE",
+			EnvVar: EnvVar("HTTP_MODE"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "http-compression, z",
 			Usage:  "Web server compression `METHOD` (gzip, none)",
-			EnvVar: "PHOTOPRISM_HTTP_COMPRESSION",
+			EnvVar: EnvVar("HTTP_COMPRESSION"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "http-host, ip",
 			Usage:  "Web server `IP` address",
-			EnvVar: "PHOTOPRISM_HTTP_HOST",
+			EnvVar: EnvVar("HTTP_HOST"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "http-port, port",
 			Value:  2342,
 			Usage:  "Web server port `NUMBER`",
-			EnvVar: "PHOTOPRISM_HTTP_PORT",
+			EnvVar: EnvVar("HTTP_PORT"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-driver, db",
 			Usage:  "database `DRIVER` (sqlite, mysql)",
 			Value:  "sqlite",
-			EnvVar: "PHOTOPRISM_DATABASE_DRIVER",
+			EnvVar: EnvVar("DATABASE_DRIVER"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-dsn, dsn",
 			Usage:  "database connection `DSN` (sqlite file, optional for mysql)",
-			EnvVar: "PHOTOPRISM_DATABASE_DSN",
+			EnvVar: EnvVar("DATABASE_DSN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-name, db-name",
 			Value:  "photoprism",
 			Usage:  "database schema `NAME`",
-			EnvVar: "PHOTOPRISM_DATABASE_NAME",
+			EnvVar: EnvVar("DATABASE_NAME"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-server, db-server",
 			Usage:  "database `HOST` incl. port e.g. \"mariadb:3306\" (or socket path)",
-			EnvVar: "PHOTOPRISM_DATABASE_SERVER",
+			EnvVar: EnvVar("DATABASE_SERVER"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-user, db-user",
 			Value:  "photoprism",
 			Usage:  "database user `NAME`",
-			EnvVar: "PHOTOPRISM_DATABASE_USER",
+			EnvVar: EnvVar("DATABASE_USER"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "database-password, db-pass",
 			Usage:  "database user `PASSWORD`",
-			EnvVar: "PHOTOPRISM_DATABASE_PASSWORD",
+			EnvVar: EnvVar("DATABASE_PASSWORD"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "database-conns",
 			Usage:  "maximum `NUMBER` of open database connections",
-			EnvVar: "PHOTOPRISM_DATABASE_CONNS",
+			EnvVar: EnvVar("DATABASE_CONNS"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "database-conns-idle",
 			Usage:  "maximum `NUMBER` of idle database connections",
-			EnvVar: "PHOTOPRISM_DATABASE_CONNS_IDLE",
+			EnvVar: EnvVar("DATABASE_CONNS_IDLE"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "sips-bin",
 			Usage:  "Sips `COMMAND` for media file conversion *macOS only*",
 			Value:  "sips",
-			EnvVar: "PHOTOPRISM_SIPS_BIN",
+			EnvVar: EnvVar("SIPS_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "sips-blacklist",
 			Usage:  "do not use Sips to convert files with these `EXTENSIONS` *macOS only*",
 			Value:  "avif,avifs",
-			EnvVar: "PHOTOPRISM_SIPS_BLACKLIST",
+			EnvVar: EnvVar("SIPS_BLACKLIST"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "ffmpeg-bin",
 			Usage:  "FFmpeg `COMMAND` for video transcoding and thumbnail extraction",
 			Value:  "ffmpeg",
-			EnvVar: "PHOTOPRISM_FFMPEG_BIN",
+			EnvVar: EnvVar("FFMPEG_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "ffmpeg-encoder, vc",
 			Usage:  "FFmpeg AVC encoder `NAME`",
 			Value:  "libx264",
-			EnvVar: "PHOTOPRISM_FFMPEG_ENCODER",
+			EnvVar: EnvVar("FFMPEG_ENCODER"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.IntFlag{
 			Name:   "ffmpeg-bitrate, vb",
 			Usage:  "maximum FFmpeg encoding `BITRATE` (Mbit/s)",
 			Value:  50,
-			EnvVar: "PHOTOPRISM_FFMPEG_BITRATE",
+			EnvVar: EnvVar("FFMPEG_BITRATE"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "ffmpeg-map-video",
 			Usage:  "video `STREAMS` that should be transcoded",
 			Value:  ffmpeg.MapVideoDefault,
-			EnvVar: "PHOTOPRISM_FFMPEG_MAP_VIDEO",
+			EnvVar: EnvVar("FFMPEG_MAP_VIDEO"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "ffmpeg-map-audio",
 			Usage:  "audio `STREAMS` that should be transcoded",
 			Value:  ffmpeg.MapAudioDefault,
-			EnvVar: "PHOTOPRISM_FFMPEG_MAP_AUDIO",
+			EnvVar: EnvVar("FFMPEG_MAP_AUDIO"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "exiftool-bin",
 			Usage:  "ExifTool `COMMAND` for extracting metadata",
 			Value:  "exiftool",
-			EnvVar: "PHOTOPRISM_EXIFTOOL_BIN",
+			EnvVar: EnvVar("EXIFTOOL_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "darktable-bin",
 			Usage:  "Darktable CLI `COMMAND` for RAW to JPEG conversion",
 			Value:  "darktable-cli",
-			EnvVar: "PHOTOPRISM_DARKTABLE_BIN",
+			EnvVar: EnvVar("DARKTABLE_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "darktable-blacklist",
 			Usage:  "do not use Darktable to convert files with these `EXTENSIONS`",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_DARKTABLE_BLACKLIST",
+			EnvVar: EnvVar("DARKTABLE_BLACKLIST"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "darktable-cache-path",
 			Usage:  "custom Darktable cache `PATH`",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_DARKTABLE_CACHE_PATH",
+			EnvVar: EnvVar("DARKTABLE_CACHE_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "darktable-config-path",
 			Usage:  "custom Darktable config `PATH`",
 			Value:  "",
-			EnvVar: "PHOTOPRISM_DARKTABLE_CONFIG_PATH",
+			EnvVar: EnvVar("DARKTABLE_CONFIG_PATH"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "rawtherapee-bin",
 			Usage:  "RawTherapee CLI `COMMAND` for RAW to JPEG conversion",
 			Value:  "rawtherapee-cli",
-			EnvVar: "PHOTOPRISM_RAWTHERAPEE_BIN",
+			EnvVar: EnvVar("RAWTHERAPEE_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "rawtherapee-blacklist",
 			Usage:  "do not use RawTherapee to convert files with these `EXTENSIONS`",
 			Value:  "dng",
-			EnvVar: "PHOTOPRISM_RAWTHERAPEE_BLACKLIST",
+			EnvVar: EnvVar("RAWTHERAPEE_BLACKLIST"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "imagemagick-bin",
 			Usage:  "ImageMagick CLI `COMMAND` for image file conversion",
 			Value:  "convert",
-			EnvVar: "PHOTOPRISM_IMAGEMAGICK_BIN",
+			EnvVar: EnvVar("IMAGEMAGICK_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "imagemagick-blacklist",
 			Usage:  "do not use ImageMagick to convert files with these `EXTENSIONS`",
 			Value:  "heif,heic,heics,avif,avifs,jxl",
-			EnvVar: "PHOTOPRISM_IMAGEMAGICK_BLACKLIST",
+			EnvVar: EnvVar("IMAGEMAGICK_BLACKLIST"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "heifconvert-bin",
 			Usage:  "libheif HEIC image conversion `COMMAND`",
 			Value:  "heif-convert",
-			EnvVar: "PHOTOPRISM_HEIFCONVERT_BIN",
+			EnvVar: EnvVar("HEIFCONVERT_BIN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "download-token",
 			Usage:  "`DEFAULT` download URL token for originals (leave empty for a random value)",
-			EnvVar: "PHOTOPRISM_DOWNLOAD_TOKEN",
+			EnvVar: EnvVar("DOWNLOAD_TOKEN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "preview-token",
 			Usage:  "`DEFAULT` thumbnail and video streaming URL token (leave empty for a random value)",
-			EnvVar: "PHOTOPRISM_PREVIEW_TOKEN",
+			EnvVar: EnvVar("PREVIEW_TOKEN"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "thumb-color",
 			Usage:  "standard color `PROFILE` for thumbnails (leave blank to disable)",
 			Value:  "sRGB",
-			EnvVar: "PHOTOPRISM_THUMB_COLOR",
+			EnvVar: EnvVar("THUMB_COLOR"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "thumb-filter, filter",
 			Usage:  "image downscaling filter `NAME` (best to worst: blackman, lanczos, cubic, linear)",
 			Value:  "lanczos",
-			EnvVar: "PHOTOPRISM_THUMB_FILTER",
+			EnvVar: EnvVar("THUMB_FILTER"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "thumb-size",
 			Usage:  "maximum size of thumbnails created during indexing in `PIXELS` (720-7680)",
 			Value:  2048,
-			EnvVar: "PHOTOPRISM_THUMB_SIZE",
+			EnvVar: EnvVar("THUMB_SIZE"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "thumb-size-uncached",
 			Usage:  "maximum size of missing thumbnails created on demand in `PIXELS` (720-7680)",
 			Value:  7680,
-			EnvVar: "PHOTOPRISM_THUMB_SIZE_UNCACHED",
+			EnvVar: EnvVar("THUMB_SIZE_UNCACHED"),
 		}}, {
 		Flag: cli.BoolFlag{
 			Name:   "thumb-uncached, u",
 			Usage:  "enable on-demand creation of missing thumbnails (high memory and cpu usage)",
-			EnvVar: "PHOTOPRISM_THUMB_UNCACHED",
+			EnvVar: EnvVar("THUMB_UNCACHED"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "jpeg-quality, q",
 			Usage:  "a higher value increases the `QUALITY` and file size of JPEG images and thumbnails (25-100)",
 			Value:  thumb.JpegQuality.String(),
-			EnvVar: "PHOTOPRISM_JPEG_QUALITY",
+			EnvVar: EnvVar("JPEG_QUALITY"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "jpeg-size",
 			Usage:  "maximum size of created JPEG sidecar files in `PIXELS` (720-30000)",
 			Value:  7680,
-			EnvVar: "PHOTOPRISM_JPEG_SIZE",
+			EnvVar: EnvVar("JPEG_SIZE"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "png-size",
 			Usage:  "maximum size of created PNG sidecar files in `PIXELS` (720-30000)",
 			Value:  7680,
-			EnvVar: "PHOTOPRISM_PNG_SIZE",
+			EnvVar: EnvVar("PNG_SIZE"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "face-size",
 			Usage:  "minimum size of faces in `PIXELS` (20-10000)",
 			Value:  face.SizeThreshold,
-			EnvVar: "PHOTOPRISM_FACE_SIZE",
+			EnvVar: EnvVar("FACE_SIZE"),
 		}}, {
 		Flag: cli.Float64Flag{
 			Name:   "face-score",
 			Usage:  "minimum face `QUALITY` score (1-100)",
 			Value:  face.ScoreThreshold,
-			EnvVar: "PHOTOPRISM_FACE_SCORE",
+			EnvVar: EnvVar("FACE_SCORE"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "face-overlap",
 			Usage:  "face area overlap threshold in `PERCENT` (1-100)",
 			Value:  face.OverlapThreshold,
-			EnvVar: "PHOTOPRISM_FACE_OVERLAP",
+			EnvVar: EnvVar("FACE_OVERLAP"),
 		}}, {
 		Flag: cli.IntFlag{
 			Name:   "face-cluster-size",
 			Usage:  "minimum size of automatically clustered faces in `PIXELS` (20-10000)",
 			Value:  face.ClusterSizeThreshold,
-			EnvVar: "PHOTOPRISM_FACE_CLUSTER_SIZE",
+			EnvVar: EnvVar("FACE_CLUSTER_SIZE"),
 		}, Tags: []string{EnvSponsor}}, {
 		Flag: cli.IntFlag{
 			Name:   "face-cluster-score",
 			Usage:  "minimum `QUALITY` score of automatically clustered faces (1-100)",
 			Value:  face.ClusterScoreThreshold,
-			EnvVar: "PHOTOPRISM_FACE_CLUSTER_SCORE",
+			EnvVar: EnvVar("FACE_CLUSTER_SCORE"),
 		}, Tags: []string{EnvSponsor}}, {
 		Flag: cli.IntFlag{
 			Name:   "face-cluster-core",
 			Usage:  "`NUMBER` of faces forming a cluster core (1-100)",
 			Value:  face.ClusterCore,
-			EnvVar: "PHOTOPRISM_FACE_CLUSTER_CORE",
+			EnvVar: EnvVar("FACE_CLUSTER_CORE"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.Float64Flag{
 			Name:   "face-cluster-dist",
 			Usage:  "similarity `DISTANCE` of faces forming a cluster core (0.1-1.5)",
 			Value:  face.ClusterDist,
-			EnvVar: "PHOTOPRISM_FACE_CLUSTER_DIST",
+			EnvVar: EnvVar("FACE_CLUSTER_DIST"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.Float64Flag{
 			Name:   "face-match-dist",
 			Usage:  "similarity `OFFSET` for matching faces with existing clusters (0.1-1.5)",
 			Value:  face.MatchDist,
-			EnvVar: "PHOTOPRISM_FACE_MATCH_DIST",
+			EnvVar: EnvVar("FACE_MATCH_DIST"),
 		},
 		Tags: []string{EnvSponsor}}, {
 		Flag: cli.StringFlag{
 			Name:   "pid-filename",
 			Usage:  "process id `FILE` *daemon-mode only*",
-			EnvVar: "PHOTOPRISM_PID_FILENAME",
+			EnvVar: EnvVar("PID_FILENAME"),
 		}}, {
 		Flag: cli.StringFlag{
 			Name:   "log-filename",
 			Usage:  "server log `FILE` *daemon-mode only*",
-			EnvVar: "PHOTOPRISM_LOG_FILENAME",
 			Value:  "",
+			EnvVar: EnvVar("LOG_FILENAME"),
 		}},
 }