Commit Graph

665 Commits

Author SHA1 Message Date
Kristoffer Dalby
4d3b638a3d
Add note about main containing unreleased changes
#201
2021-10-25 19:38:11 +01:00
Kristoffer Dalby
6d162eeff9
Merge pull request #197 from kradalby/config-simplification 2021-10-24 22:27:18 +01:00
Kristoffer Dalby
746d4037da
Fix config and tests 2021-10-24 21:30:51 +01:00
Kristoffer Dalby
1237e02f7c Merge branch 'config-simplification' of github.com:kradalby/headscale into config-simplification 2021-10-24 21:21:08 +01:00
Kristoffer Dalby
7da3d4ba50
Resolve merge conflict 2021-10-24 21:21:01 +01:00
Kristoffer Dalby
8853315dcc
Update config-example.yaml
Co-authored-by: Juan Font <juanfontalonso@gmail.com>
2021-10-23 10:40:15 +01:00
Kristoffer Dalby
5aaffaaecb
Merge pull request #196 from kradalby/derp-improvements
Add ability to fetch DERP from url and file
2021-10-23 09:20:27 +01:00
Kristoffer Dalby
389a8d47a3
Merge branch 'main' into derp-improvements 2021-10-22 23:58:48 +01:00
Kristoffer Dalby
a355769416
Update derp-example.yaml
Co-authored-by: Juan Font <juanfontalonso@gmail.com>
2021-10-22 23:58:27 +01:00
Juan Font
1a8c9216d6
Merge pull request #194 from juanfont/update-contributors
docs(README): update contributors
2021-10-23 00:11:22 +02:00
Juan Font
81316ef644
Merge branch 'main' into update-contributors 2021-10-22 21:28:27 +02:00
Kristoffer Dalby
4d4d0de356
Start adding comments to config 2021-10-22 18:27:11 +01:00
Kristoffer Dalby
b85adbc40a
Remove the need for multiple config files
This commit removes the almost a 100% redundant tests (two fields were
checked differently) and makes a single example configuration for users.
2021-10-22 18:14:29 +01:00
Kristoffer Dalby
aefbd66317 Remove derpmap volume from integration tests 2021-10-22 16:57:51 +00:00
Kristoffer Dalby
d875cca69d move integration to yaml, add new derp configuration 2021-10-22 16:57:01 +00:00
Kristoffer Dalby
0e902fe949 Add certificates to docker image so we can get derpmap from tailscale 2021-10-22 16:56:23 +00:00
Kristoffer Dalby
582eb57a09 Use the new derp map 2021-10-22 16:56:00 +00:00
Kristoffer Dalby
177f1eca06 Add helper functions for building derp maps from urls and file 2021-10-22 16:55:35 +00:00
Kristoffer Dalby
57f46ded83 Split derp into its own config struct 2021-10-22 16:55:14 +00:00
Kristoffer Dalby
aa245c2d06 Remove derp.yaml, add selfhosted example
This PR will promote fetching the derpmap directly from tailscale, so we
will remove our example, as it might easily get outdated.

Add a derp-example that shows how a user can also add their own derp
server.
2021-10-22 16:52:39 +00:00
Kristoffer Dalby
e836db1ead Add config.yaml to gitignore 2021-10-22 16:51:19 +00:00
github-actions[bot]
5420347d24
docs(README): update contributors 2021-10-22 06:58:20 +00:00
Kristoffer Dalby
9e2637d65f
Merge pull request #192 from derelm/patch-2 2021-10-22 07:57:48 +01:00
Juan Font
c6046597ed
Merge branch 'main' into update-contributors 2021-10-22 00:01:18 +02:00
Juan Font
a46c8fe914
Merge branch 'main' into patch-2 2021-10-21 23:56:10 +02:00
Juan Font
f822816cdb
Merge pull request #193 from juanfont/fix-again-contributors
Another fix for the contributors section in README
2021-10-21 23:55:41 +02:00
Juan Font Alonso
f3bf9b4bbb Contributors again fixed 2021-10-21 23:54:20 +02:00
Juan Font
9f02899261
Merge branch 'main' into patch-2 2021-10-21 23:41:52 +02:00
github-actions[bot]
75f3e1fb03
docs(README): update contributors 2021-10-21 21:38:02 +00:00
Juan Font
9fbfa7c1f5
Merge pull request #191 from juanfont/fix-contributors
Fix contributors
2021-10-21 23:32:43 +02:00
Juan Font Alonso
d5aef85bf2 Fix contributors 2021-10-21 23:21:38 +02:00
derelm
88b32e4b18
fix typo 2021-10-21 23:07:35 +02:00
Juan Font Alonso
e425e3ffd3 Fix contributors 2021-10-21 22:53:30 +02:00
Juan Font
355483fd86
Merge pull request #184 from juanfont/doc-reorg-v1
Move documentation away from README and use YAML everywhere
2021-10-21 22:38:59 +02:00
Juan Font Alonso
672d8474b9 PRettier on the yamls 2021-10-21 21:18:50 +02:00
Juan Font Alonso
73e4d38670 Merge branch 'doc-reorg-v1' of https://github.com/juanfont/headscale into doc-reorg-v1 2021-10-21 21:01:57 +02:00
Juan Font Alonso
561c15bbe8 Prettier 2021-10-21 21:01:52 +02:00
Juan Font Alonso
b93aa723cb Run contributors on merge to master 2021-10-21 20:58:30 +02:00
Juan Font Alonso
636943c715 Improved docker cmd 2021-10-21 20:57:18 +02:00
Juan Font
0a6a67da85
Merge branch 'main' into doc-reorg-v1 2021-10-21 20:55:48 +02:00
Juan Font Alonso
e9ffd366dd Improvements here and there 2021-10-21 20:54:41 +02:00
Juan Font Alonso
4be0b3f556 Mention disable check updates in the doc 2021-10-21 20:54:29 +02:00
Juan Font Alonso
a0bfad6d6e Headscale is not capitalized 2021-10-21 20:48:29 +02:00
Juan Font Alonso
bb1f17f5af Added glossary 2021-10-21 20:46:19 +02:00
Juan Font
95bc2ee241
Merge pull request #190 from juanfont/fix-arm64
Fix arm64 (now for good)
2021-10-21 20:40:17 +02:00
Juan Font Alonso
16a90e799c Contributors should be working 2021-10-21 20:36:26 +02:00
Juan Font Alonso
4c2f84b211 Add contributors Action 2021-10-21 20:33:58 +02:00
Juan Font Alonso
b799635fbb Merge branch 'fix-arm64' of https://github.com/juanfont/headscale into fix-arm64 2021-10-21 19:56:51 +02:00
Juan Font Alonso
bc145952d4 Finally fix arm64 build 2021-10-21 19:56:36 +02:00
Kristoffer Dalby
2c5701917d
Merge branch 'main' into doc-reorg-v1 2021-10-21 18:46:29 +01:00