Skip to content

Commit 134c72f

Browse files
committed
Set db_ssl to false by default, fixes #1043
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
1 parent 70f2f5d commit 134c72f

7 files changed

Lines changed: 11 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
## 0.18.x (2022-xx-xx)
44

5-
- Added an OIDC AllowGroups Configuration options and authorization check [#1041](https://github.com/juanfont/headscale/pull/1041)
6-
- Reworked routing and added support for subnet router failover [#1024](https://github.com/juanfont/headscale/pull/1024)
7-
85
### Changes
96

7+
- Reworked routing and added support for subnet router failover [#1024](https://github.com/juanfont/headscale/pull/1024)
8+
- Added an OIDC AllowGroups Configuration options and authorization check [#1041](https://github.com/juanfont/headscale/pull/1041)
9+
- Set `db_ssl` to false by default [#1052](https://github.com/juanfont/headscale/pull/1052)
10+
1011
## 0.17.1 (2022-12-05)
1112

1213
### Changes

config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ func LoadConfig(path string, isFile bool) error {
172172
viper.SetDefault("cli.timeout", "5s")
173173
viper.SetDefault("cli.insecure", false)
174174

175+
viper.SetDefault("db_ssl", false)
176+
175177
viper.SetDefault("oidc.scope", []string{oidc.ScopeOpenID, "profile", "email"})
176178
viper.SetDefault("oidc.strip_email_domain", true)
177179
viper.SetDefault("oidc.only_start_if_oidc_is_available", true)

integration_test/etc/alt-config.dump.gold.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cli:
33
insecure: false
44
timeout: 5s
55
db_path: /tmp/integration_test_db.sqlite3
6+
db_ssl: false
67
db_type: sqlite3
78
derp:
89
auto_update_enabled: false

integration_test/etc/alt-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dns_config:
1616
- 127.0.0.11
1717
- 1.1.1.1
1818
db_path: /tmp/integration_test_db.sqlite3
19+
db_ssl: false
1920
private_key_path: private.key
2021
noise:
2122
private_key_path: noise_private.key

integration_test/etc/alt-env-config.dump.gold.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cli:
33
insecure: false
44
timeout: 5s
55
db_path: /tmp/integration_test_db.sqlite3
6+
db_ssl: false
67
db_type: sqlite3
78
derp:
89
auto_update_enabled: false

integration_test/etc/alt-env-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dns_config:
1515
nameservers:
1616
- 1.1.1.1
1717
db_path: /tmp/integration_test_db.sqlite3
18+
db_ssl: false
1819
private_key_path: private.key
1920
noise:
2021
private_key_path: noise_private.key

integration_test/etc/config.dump.gold.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ cli:
33
insecure: false
44
timeout: 5s
55
db_path: /tmp/integration_test_db.sqlite3
6+
db_ssl: false
67
db_type: sqlite3
78
derp:
89
auto_update_enabled: false

0 commit comments

Comments
 (0)