Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ proxies/*.yml
temp
shield
!proto/*
.shield.yaml
config.yaml
dist
coverage.txt
coverage.out
Expand Down
6 changes: 3 additions & 3 deletions cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func serverInitCommand() *cobra.Command {
Short: "Initialize server",
Long: heredoc.Doc(`
Initializing server. Creating a sample of shield server config.
Default: ./.shield.yaml
Default: ./config.yaml
`),
Example: "shield server init",
RunE: func(cmd *cli.Command, args []string) error {
Expand All @@ -76,7 +76,7 @@ func serverInitCommand() *cobra.Command {
},
}

c.Flags().StringVarP(&configFile, "output", "o", "./.shield.yaml", "Output config file path")
c.Flags().StringVarP(&configFile, "output", "o", "./config.yaml", "Output config file path")
c.Flags().StringVarP(&resourcesURL, "resources", "r", "", heredoc.Doc(`
URL path of resources. Full path prefixed with scheme where resources config yaml files are kept
e.g.:
Expand Down Expand Up @@ -161,6 +161,6 @@ func serverMigrateRollbackCommand() *cobra.Command {
},
}

c.Flags().StringVarP(&configFile, "config", "c", "./config.yaml", "Config file path")
c.Flags().StringVarP(&configFile, "config", "c", "", "Config file path")
return c
}
52 changes: 0 additions & 52 deletions config/.shield.sample.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func Load(serverConfigfileFromFlag string) (*Shield, error) {
conf := &Shield{}

var options []config.LoaderOption
options = append(options, config.WithName(".shield.yaml"))
options = append(options, config.WithName("config.yaml"))
options = append(options, config.WithEnvKeyReplacer(".", "_"))
options = append(options, config.WithEnvPrefix("SHIELD"))
if p, err := os.Getwd(); err == nil {
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/getting-started/configurations.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Configurations

Shield can be configured with .shield.yaml file. An example of such is:
Shield can be configured with config.yaml file. An example of such is:

```yaml
version: 1
Expand Down