diff --git a/src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go b/src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go index bd55508b9fa8119a0b31ffe0e53da9f277d3368d..a4f8f5682d5bfa25c9903e10f83cdb1e1480b276 100644 --- a/src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go +++ b/src/github.com/turt2live/matrix-media-repo/cmd/media_repo/main.go @@ -45,9 +45,11 @@ type EmptyResponse struct{} func main() { configPath := flag.String("config", "media-repo.yaml", "The path to the configuration") + migrationsPath := flag.String("migrations", "./migrations", "The absolute path the migrations folder") flag.Parse() config.Path = *configPath + config.Runtime.MigrationsPath = *migrationsPath rtr := mux.NewRouter() diff --git a/src/github.com/turt2live/matrix-media-repo/config/config.go b/src/github.com/turt2live/matrix-media-repo/config/config.go index 58c5e2cd1ac08af0d4202283396caf1e91234eea..ce2bc541218a2bbb59a89cb55590b65f7ede5829 100644 --- a/src/github.com/turt2live/matrix-media-repo/config/config.go +++ b/src/github.com/turt2live/matrix-media-repo/config/config.go @@ -14,6 +14,11 @@ type HomeserverConfig struct { ClientServerApi string `yaml:"csApi"` } +type runtimeConfig struct { + MigrationsPath string +} +var Runtime = &runtimeConfig{} + type MediaRepoConfig struct { General struct { BindAddress string `yaml:"bindAddress"` diff --git a/src/github.com/turt2live/matrix-media-repo/storage/storage.go b/src/github.com/turt2live/matrix-media-repo/storage/storage.go index 0973752ba5bf55737217ee09fdd84b6a16fa2ce7..99f36621d66000b5a9ff84df3b72486f3cfe56ea 100644 --- a/src/github.com/turt2live/matrix-media-repo/storage/storage.go +++ b/src/github.com/turt2live/matrix-media-repo/storage/storage.go @@ -58,7 +58,7 @@ func OpenDatabase(connectionString string) (error) { } // Make sure the database is how we want it - migrator, err := gomigrate.NewMigratorWithLogger(d.db, gomigrate.Postgres{}, "./migrations", logrus.StandardLogger()) + migrator, err := gomigrate.NewMigratorWithLogger(d.db, gomigrate.Postgres{}, config.Runtime.MigrationsPath, logrus.StandardLogger()) if err != nil { return err }