Update the example configs with the new unified config (#146)

* Update the example configs with the new unified config

* Review comments

* Use an int for the config version
This commit is contained in:
Mark Haines 2017-07-05 13:10:28 +01:00 committed by GitHub
parent 8f1dca4e74
commit b2f9b8c641
5 changed files with 79 additions and 49 deletions

View file

@ -30,7 +30,7 @@ import (
// Version is the current version of the config format.
// This will change whenever we make breaking changes to the config format.
const Version = "v0"
const Version = 0
// Dendrite contains all the config used by a dendrite process.
// Relative paths are resolved relative to the current working directory
@ -41,7 +41,7 @@ type Dendrite struct {
// to update their config file to the current version.
// The version of the file should only be different if there has
// been a breaking change to the config file format.
Version string `yaml:"version"`
Version int `yaml:"version"`
// The configuration required for a matrix server.
Matrix struct {

View file

@ -32,7 +32,7 @@ func TestLoadConfigRelative(t *testing.T) {
}
const testConfig = `
version: v0
version: 0
matrix:
server_name: localhost
private_key: matrix_key.pem