hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-26 15:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump version number of config to 2

Browse source
This commit is contained in:
Neil Alexander 2022-01-05 15:15:36 +00:00
parent 773a082cb4
commit 1099a1cc0c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/docker/config/dendrite.yaml
View file

@ -28,7 +28,7 @@
# connection can be idle in seconds - a negative value is unlimited. # connection can be idle in seconds - a negative value is unlimited.
# The version of the configuration file. # The version of the configuration file.
version: 1 version: 2
# Global Matrix configuration. This configuration applies to all components. # Global Matrix configuration. This configuration applies to all components.
global: global:

2
dendrite-config.yaml
View file

@ -28,7 +28,7 @@
# connection can be idle in seconds - a negative value is unlimited. # connection can be idle in seconds - a negative value is unlimited.
# The version of the configuration file. # The version of the configuration file.
version: 1 version: 2
# Global Matrix configuration. This configuration applies to all components. # Global Matrix configuration. This configuration applies to all components.
global: global:

2
setup/config/config.go
View file

@ -40,7 +40,7 @@ var keyIDRegexp = regexp.MustCompile("^ed25519:[a-zA-Z0-9_]+$")
// Version is the current version of the config format. // Version is the current version of the config format.
// This will change whenever we make breaking changes to 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. // Dendrite contains all the config used by a dendrite process.
// Relative paths are resolved relative to the current working directory // Relative paths are resolved relative to the current working directory

2
setup/config/config_test.go
View file

@ -33,7 +33,7 @@ func TestLoadConfigRelative(t *testing.T) {
} }
const testConfig = ` const testConfig = `
version: 1 version: 2
global: global:
server_name: localhost server_name: localhost
private_key: matrix_key.pem private_key: matrix_key.pem