Skip to content

Add default configuration values #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdamBark wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add default configuration values #316

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f933203
Add default configuration values
AdamBark Jul 24, 2020
6bdc6f1
Apply configuration defaults from a file
AdamBark Jul 27, 2020
6f83814
Update cmd/pebble/main.go
AdamBark Jul 27, 2020
193f076
Add check for default config existence
AdamBark Jul 29, 2020
9590ec4
Update default config naming
AdamBark Jul 31, 2020
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
13 changes: 11 additions & 2 deletions cmd/pebble/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,19 @@ type config struct {
}
}

const DefaultConfigPath = "test/config/default-config.json"

func getDefaultConfig() config {
var c config
err := cmd.ReadConfigFile(DefaultConfigPath, &c)
cmd.FailOnError(err, "Reading default JSON config file into config structure")
return c
}

func main() {
configFile := flag.String(
"config",
"test/config/pebble-config.json",
DefaultConfigPath,
"File path to the Pebble configuration file")
strictMode := flag.Bool(
"strict",
Expand All @@ -52,7 +61,7 @@ func main() {
logger := log.New(os.Stdout, "Pebble ", log.LstdFlags)
logger.Printf("Starting Pebble ACME server")

var c config
c := getDefaultConfig()
err := cmd.ReadConfigFile(*configFile, &c)
cmd.FailOnError(err, "Reading JSON config file into config structure")

Expand Down
0 test/config/pebble-config.json → test/config/default-config.json
View file
Open in desktop
File renamed without changes.