all repos — homestead @ d8943a31ad9507a59b5fd53167900280b0118020

Code for my website

remove migration code for root directory

Alan Pearce
commit

d8943a31ad9507a59b5fd53167900280b0118020

parent

e92c0deb48827d72ac36cb8280bf7dec757b248a

1 file changed, 2 insertions(+), 6 deletions(-)

jump to
M internal/website/website.go → internal/website/website.go
@@ -26,7 +26,6 @@ "github.com/osdevisnot/sorvor/pkg/livereload"
 )
 
 type Options struct {
-	DataRoot         string     `conf:"noprint"`
 	Root             string     `conf:"default:./website"`
 	Redirect         bool       `conf:"default:true"`
 	Development      bool       `conf:"default:false,flag:dev"`

@@ -60,7 +59,7 @@ Shutdown: func() {},
 		},
 	}
 
-	err := prepareRootDirectory(opts.DataRoot, opts.Root)
+	err := prepareRootDirectory(opts.Root)
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not prepare root directory")
 	}

@@ -167,15 +166,12 @@
 	return website, nil
 }
 
-func prepareRootDirectory(dataRoot, root string) errors.E {
+func prepareRootDirectory(root string) errors.E {
 	if !file.Exists(root) {
 		err := os.MkdirAll(root, 0755)
 		if err != nil {
 			return errors.WithMessage(err, "could not create root directory")
 		}
-	} else if dataRoot != "" && file.Exists(filepath.Join(dataRoot, "public")) {
-		// must be pre-sqlite if this exists
-		return file.CleanDir(dataRoot)
 	}
 
 	return nil