mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-25 01:07:52 +00:00
Merge branch 'hs2021-v2' of https://github.com/juanfont/headscale into hs2021-v2
This commit is contained in:
commit
128ec6717c
13
CHANGELOG.md
13
CHANGELOG.md
@ -1,10 +1,21 @@
|
|||||||
# CHANGELOG
|
# CHANGELOG
|
||||||
|
|
||||||
## 0.17.0 (2022-xx-xx)
|
## 0.17.0 (2022-XX-XX)
|
||||||
|
|
||||||
|
## 0.16.2 (2022-08-14)
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
|
- Fixed bugs in the client registration process after migration to NodeKey [#735](https://github.com/juanfont/headscale/pull/735)
|
||||||
|
|
||||||
|
## 0.16.1 (2022-08-12)
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
- Updated dependencies (including the library that lacked armhf support) [#722](https://github.com/juanfont/headscale/pull/722)
|
- Updated dependencies (including the library that lacked armhf support) [#722](https://github.com/juanfont/headscale/pull/722)
|
||||||
- Fix missing group expansion in function `excludeCorretlyTaggedNodes` [#563](https://github.com/juanfont/headscale/issues/563)
|
- Fix missing group expansion in function `excludeCorretlyTaggedNodes` [#563](https://github.com/juanfont/headscale/issues/563)
|
||||||
- Improve registration protocol implementation and switch to NodeKey as main identifier [#725](https://github.com/juanfont/headscale/pull/725)
|
- Improve registration protocol implementation and switch to NodeKey as main identifier [#725](https://github.com/juanfont/headscale/pull/725)
|
||||||
|
- Add ability to connect to PostgreSQL via unix socket [#734](https://github.com/juanfont/headscale/pull/734)
|
||||||
|
|
||||||
## 0.16.0 (2022-07-25)
|
## 0.16.0 (2022-07-25)
|
||||||
|
|
||||||
|
12
app.go
12
app.go
@ -145,13 +145,19 @@ func NewHeadscale(cfg *Config) (*Headscale, error) {
|
|||||||
switch cfg.DBtype {
|
switch cfg.DBtype {
|
||||||
case Postgres:
|
case Postgres:
|
||||||
dbString = fmt.Sprintf(
|
dbString = fmt.Sprintf(
|
||||||
"host=%s port=%d dbname=%s user=%s password=%s sslmode=disable",
|
"host=%s dbname=%s user=%s sslmode=disable",
|
||||||
cfg.DBhost,
|
cfg.DBhost,
|
||||||
cfg.DBport,
|
|
||||||
cfg.DBname,
|
cfg.DBname,
|
||||||
cfg.DBuser,
|
cfg.DBuser,
|
||||||
cfg.DBpass,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if cfg.DBport != 0 {
|
||||||
|
dbString += fmt.Sprintf(" port=%d", cfg.DBport)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.DBpass != "" {
|
||||||
|
dbString += fmt.Sprintf(" password=%s", cfg.DBpass)
|
||||||
|
}
|
||||||
case Sqlite:
|
case Sqlite:
|
||||||
dbString = cfg.DBpath
|
dbString = cfg.DBpath
|
||||||
default:
|
default:
|
||||||
|
@ -121,6 +121,7 @@ db_type: sqlite3
|
|||||||
db_path: /var/lib/headscale/db.sqlite
|
db_path: /var/lib/headscale/db.sqlite
|
||||||
|
|
||||||
# # Postgres config
|
# # Postgres config
|
||||||
|
# If using a Unix socket to connect to Postgres, set the socket path in the 'host' field and leave 'port' blank.
|
||||||
# db_type: postgres
|
# db_type: postgres
|
||||||
# db_host: localhost
|
# db_host: localhost
|
||||||
# db_port: 5432
|
# db_port: 5432
|
||||||
|
Loading…
x
Reference in New Issue
Block a user