From 1099a1cc0c155eedcb647c8a8134173535795c29 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 5 Jan 2022 15:15:36 +0000 Subject: [PATCH] Bump version number of config to 2 --- build/docker/config/dendrite.yaml | 2 +- dendrite-config.yaml | 2 +- setup/config/config.go | 2 +- setup/config/config_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/config/dendrite.yaml b/build/docker/config/dendrite.yaml index de7491c9..6d5ebc9f 100644 --- a/build/docker/config/dendrite.yaml +++ b/build/docker/config/dendrite.yaml @@ -28,7 +28,7 @@ # connection can be idle in seconds - a negative value is unlimited. # The version of the configuration file. -version: 1 +version: 2 # Global Matrix configuration. This configuration applies to all components. global: diff --git a/dendrite-config.yaml b/dendrite-config.yaml index 2957f900..5ef3cc85 100644 --- a/dendrite-config.yaml +++ b/dendrite-config.yaml @@ -28,7 +28,7 @@ # connection can be idle in seconds - a negative value is unlimited. # The version of the configuration file. -version: 1 +version: 2 # Global Matrix configuration. This configuration applies to all components. global: diff --git a/setup/config/config.go b/setup/config/config.go index e8af91f6..8d121599 100644 --- a/setup/config/config.go +++ b/setup/config/config.go @@ -40,7 +40,7 @@ var keyIDRegexp = regexp.MustCompile("^ed25519:[a-zA-Z0-9_]+$") // Version is the current version of the config format. // This will change whenever we make breaking changes to the config format. -const Version = 1 +const Version = 2 // Dendrite contains all the config used by a dendrite process. // Relative paths are resolved relative to the current working directory diff --git a/setup/config/config_test.go b/setup/config/config_test.go index ffe9edab..5aa54929 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfigRelative(t *testing.T) { } const testConfig = ` -version: 1 +version: 2 global: server_name: localhost private_key: matrix_key.pem