Merge pull request #1892 from owncloud/change_default_thumbnails_path

change default path for thumbnails
owncloud · Apr 6, 2021 · 1fdffed · 1fdffed
2 parents 076d8c0 + 80a158b
commit 1fdffed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/changelog/unreleased/change-default-path-for-thumbnails.md b/changelog/unreleased/change-default-path-for-thumbnails.md
@@ -0,0 +1,6 @@
+Enhancement: change default path for thumbnails
+
+Changes the default path for thumbnails from `<os tmp dir>/ocis-thumbnails` to `/var/tmp/ocis/thumbnails`
+
+https://github.com/owncloud/ocis/pull/1892
+https://github.com/owncloud/ocis/issues/1891
diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go
@@ -1,9 +1,6 @@
 package flagset
 
 import (
-	"os"
-	"path/filepath"
-
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 
 	"github.com/micro/cli/v2"
@@ -140,7 +137,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "filesystemstorage-root",
-			Value:       flags.OverrideDefaultString(cfg.Thumbnail.FileSystemStorage.RootDirectory, filepath.Join(os.TempDir(), "ocis-thumbnails/")),
+			Value:       "/var/tmp/ocis/thumbnails",
 			Usage:       "Root path of the filesystem storage directory",
 			EnvVars:     []string{"THUMBNAILS_FILESYSTEMSTORAGE_ROOT"},
 			Destination: &cfg.Thumbnail.FileSystemStorage.RootDirectory,

diff --git a/thumbnails/pkg/thumbnail/storage/filesystem.go b/thumbnails/pkg/thumbnail/storage/filesystem.go
@@ -132,7 +132,7 @@ func (s *FileSystem) createUserDir(username string) (string, error) {
 }
 
 // linkImageToUserDir links the stored images to the user directory.
-// The goal is to minimize disk usage by linking to the images if they already exist and avoid file duplicaiton.
+// The goal is to minimize disk usage by linking to the images if they already exist and avoid file duplication.
 func (s *FileSystem) linkImageToUserDir(key string, userDir string) error {
 	imgRootDir := s.rootDir(key)