mirror of
https://github.com/juanfont/headscale.git
synced 2026-11-04 04:34:07 +09:00
types: move TLS config under tls with legacy fallback
tls.cert_path, tls.key_path and tls.acme.* replace the flat keys, which still work. Warn on them only when they turn TLS on: NixOS always sets them. Updates #2527
This commit is contained in:
1 parent
ee47638787
commit
dcc01dc2b0
7 files changed
+279
-106
No files matched your search
@@ -38,9 +38,9 @@ func TestConfigFileLoading(t *testing.T) {
|
||||
assert.Equal(t, "127.0.0.1:9090", viper.GetString("metrics_listen_addr"))
|
||||
assert.Equal(t, "sqlite", viper.GetString("database.type"))
|
||||
assert.Equal(t, "/var/lib/headscale/db.sqlite", viper.GetString("database.sqlite.path"))
|
||||
assert.Empty(t, viper.GetString("tls_letsencrypt_hostname"))
|
||||
assert.Equal(t, ":http", viper.GetString("tls_letsencrypt_listen"))
|
||||
assert.Equal(t, "HTTP-01", viper.GetString("tls_letsencrypt_challenge_type"))
|
||||
assert.Empty(t, viper.GetString("tls.acme.hostname"))
|
||||
assert.Equal(t, ":http", viper.GetString("tls.acme.http_listen"))
|
||||
assert.Equal(t, "HTTP-01", viper.GetString("tls.acme.challenge_type"))
|
||||
mode, err := util.ParseFileMode(viper.GetString("unix_socket_permission"))
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, fs.FileMode(0o770), mode)
|
||||
@@ -70,9 +70,9 @@ func TestConfigLoading(t *testing.T) {
|
||||
assert.Equal(t, "127.0.0.1:9090", viper.GetString("metrics_listen_addr"))
|
||||
assert.Equal(t, "sqlite", viper.GetString("database.type"))
|
||||
assert.Equal(t, "/var/lib/headscale/db.sqlite", viper.GetString("database.sqlite.path"))
|
||||
assert.Empty(t, viper.GetString("tls_letsencrypt_hostname"))
|
||||
assert.Equal(t, ":http", viper.GetString("tls_letsencrypt_listen"))
|
||||
assert.Equal(t, "HTTP-01", viper.GetString("tls_letsencrypt_challenge_type"))
|
||||
assert.Empty(t, viper.GetString("tls.acme.hostname"))
|
||||
assert.Equal(t, ":http", viper.GetString("tls.acme.http_listen"))
|
||||
assert.Equal(t, "HTTP-01", viper.GetString("tls.acme.challenge_type"))
|
||||
mode, err := util.ParseFileMode(viper.GetString("unix_socket_permission"))
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, fs.FileMode(0o770), mode)
|
||||
|
||||
Reference in new issue
Block a user