diff --git a/internal/commands/commands.go b/internal/commands/commands.go index aa4f0cd..084c173 100644 --- a/internal/commands/commands.go +++ b/internal/commands/commands.go @@ -66,6 +66,15 @@ func initConfig() { // Execute the root cobra command func Execute() { + viper.SetDefault("server.hostname", "0.0.0.0:3333") + viper.SetDefault("database.host", "127.0.0.1") + viper.SetDefault("database.name", "taskcafe") + viper.SetDefault("database.user", "taskcafe") + viper.SetDefault("database.password", "taskcafe_test") + + viper.SetDefault("queue.broker", "amqp://guest:guest@localhost:5672/") + viper.SetDefault("queue.store", "memcache://localhost:11211") + rootCmd.SetVersionTemplate(versionTemplate) rootCmd.AddCommand(newWebCmd(), newMigrateCmd(), newTokenCmd(), newWorkerCmd(), newResetPasswordCmd()) rootCmd.Execute() diff --git a/internal/commands/migrate.go b/internal/commands/migrate.go index 1bfbd14..84cd4d5 100644 --- a/internal/commands/migrate.go +++ b/internal/commands/migrate.go @@ -68,9 +68,5 @@ func newMigrateCmd() *cobra.Command { return nil }, } - viper.SetDefault("database.host", "127.0.0.1") - viper.SetDefault("database.name", "taskcafe") - viper.SetDefault("database.user", "taskcafe") - viper.SetDefault("database.password", "taskcafe_test") return c } diff --git a/internal/commands/web.go b/internal/commands/web.go index 0cc884b..b752ef8 100644 --- a/internal/commands/web.go +++ b/internal/commands/web.go @@ -81,14 +81,6 @@ func newWebCmd() *cobra.Command { cc.Flags().Bool("migrate", false, "if true, auto run's schema migrations before starting the web server") viper.BindPFlag("migrate", cc.Flags().Lookup("migrate")) viper.SetDefault("migrate", false) - viper.SetDefault("server.hostname", "0.0.0.0:3333") - viper.SetDefault("database.host", "127.0.0.1") - viper.SetDefault("database.name", "taskcafe") - viper.SetDefault("database.user", "taskcafe") - viper.SetDefault("database.password", "taskcafe_test") - - viper.SetDefault("queue.broker", "amqp://guest:guest@localhost:5672/") - viper.SetDefault("queue.store", "memcache://localhost:11211") return cc } diff --git a/internal/commands/worker.go b/internal/commands/worker.go index 100ef2f..cd9eb8e 100644 --- a/internal/commands/worker.go +++ b/internal/commands/worker.go @@ -73,12 +73,5 @@ func newWorkerCmd() *cobra.Command { return nil }, } - viper.SetDefault("database.host", "127.0.0.1") - viper.SetDefault("database.name", "taskcafe") - viper.SetDefault("database.user", "taskcafe") - viper.SetDefault("database.password", "taskcafe_test") - - viper.SetDefault("queue.broker", "amqp://guest:guest@localhost:5672/") - viper.SetDefault("queue.store", "memcache://localhost:11211") return cc }