Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							47bbb85a20 
							
						 
					 
					
						
						
							
							Merge branch 'main' into acls-doc  
						
						
						
					 
					
						2022-03-18 20:44:44 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							304109a6c5 
							
						 
					 
					
						
						
							
							Merge pull request  #511  from restanrm/fix-machine-registration-expired  
						
						
						
					 
					
						2022-03-18 20:44:05 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b65bd5baa8 
							
						 
					 
					
						
						
							
							Merge branch 'main' into fix-machine-registration-expired  
						
						
						
					 
					
						2022-03-18 19:41:26 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							53b62f3f39 
							
						 
					 
					
						
						
							
							Merge pull request  #499  from juanfont/mandatory-stun  
						
						
						
					 
					
						2022-03-18 18:28:37 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cd2914ab3b 
							
						 
					 
					
						
						
							
							Merge branch 'main' into mandatory-stun  
						
						
						
					 
					
						2022-03-18 17:44:12 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e85b97143c 
							
						 
					 
					
						
						
							
							Merge pull request  #509  from kradalby/go118  
						
						
						
					 
					
						2022-03-18 17:43:41 +00:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							db9ba17920 
							
						 
					 
					
						
						
							
							Added missing file  
						
						
						
					 
					
						2022-03-18 13:10:35 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							d5ce7d7523 
							
						 
					 
					
						
						
							
							Prettier  
						
						
						
					 
					
						2022-03-18 13:09:57 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							2e6687209b 
							
						 
					 
					
						
						
							
							Make STUN server mandatory if DERP embedded is enabled  
						
						
						
					 
					
						2022-03-18 12:58:00 +01:00 
						 
				 
			
				
					
						
							
							
								Adrien Raffin-Caboisse 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							882c0c34c1 
							
						 
					 
					
						
						
							
							chore(changelog): update changelog  
						
						
						
					 
					
						2022-03-18 09:34:18 +01:00 
						 
				 
			
				
					
						
							
							
								Adrien Raffin-Caboisse 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							61ebb713f2 
							
						 
					 
					
						
						
							
							fix(oidc): Reset expiry for reauthentication  
						
						... 
						
						
						
						The previous code resetted the expiry time to be expired.  So the machine was never reauthenticated 
						
					 
					
						2022-03-18 09:32:07 +01:00 
						 
				 
			
				
					
						
							
							
								Nico Rey 
							
						 
					 
					
						
						
						
						
							
						
						
							d68d7d5a6f 
							
						 
					 
					
						
						
							
							Docs/ACLs: Add a network diagram to help explain ACLs  
						
						
						
					 
					
						2022-03-17 19:58:56 -03:00 
						 
				 
			
				
					
						
							
							
								Nico Rey 
							
						 
					 
					
						
						
						
						
							
						
						
							bff9036f14 
							
						 
					 
					
						
						
							
							Docs/ACLs: Add router examples with subnets  
						
						
						
					 
					
						2022-03-17 19:58:34 -03:00 
						 
				 
			
				
					
						
							
							
								Nico Rey 
							
						 
					 
					
						
						
						
						
							
						
						
							8b08c2a918 
							
						 
					 
					
						
						
							
							Docs/ACLs: Namespaces are created automatically  
						
						
						
					 
					
						2022-03-17 19:24:39 -03:00 
						 
				 
			
				
					
						
							
							
								Nico Rey 
							
						 
					 
					
						
						
						
						
							
						
						
							b9f0fabb5c 
							
						 
					 
					
						
						
							
							Docs/ACLs: Wording, add intermediary router example  
						
						
						
					 
					
						2022-03-17 19:23:37 -03:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
						
						
							
						
						
							b781446e86 
							
						 
					 
					
						
						
							
							Upgrade to go 1.18  
						
						
						
					 
					
						2022-03-17 17:43:11 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1c9b1c0579 
							
						 
					 
					
						
						
							
							Merge pull request  #507  from juanfont/update-contributors  
						
						
						
					 
					
						2022-03-17 07:28:42 +00:00 
						 
				 
			
				
					
						
							
							
								github-actions[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ade9552736 
							
						 
					 
					
						
						
							
							docs(README): update contributors  
						
						
						
					 
					
						2022-03-17 06:38:00 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							68403cb76e 
							
						 
					 
					
						
						
							
							Merge pull request  #505  from y0ngb1n/fix-docs-metrics-endpoint  
						
						
						
					 
					
						2022-03-17 06:37:27 +00:00 
						 
				 
			
				
					
						
							
							
								Yang Bin 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							537ecb8db0 
							
						 
					 
					
						
						
							
							docs: fixed /metrics endpoint 8080 → 9090, reference config-example.yaml  
						
						
						
					 
					
						2022-03-17 09:25:42 +08:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5875efe4 
							
						 
					 
					
						
						
							
							Reorg errors  
						
						
						
					 
					
						2022-03-16 19:46:59 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							98ac88d5ef 
							
						 
					 
					
						
						
							
							Changed comment position  
						
						... 
						
						
						
						Co-authored-by: Kristoffer Dalby <kradalby@kradalby.no> 
						
					 
					
						2022-03-16 18:45:34 +01:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d13338a9fb 
							
						 
					 
					
						
						
							
							Merge branch 'main' into mandatory-stun  
						
						
						
					 
					
						2022-03-16 07:18:18 +00:00 
						 
				 
			
				
					
						
							
							
								Juan Font 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1579ffb66a 
							
						 
					 
					
						
						
							
							Merge pull request  #500  from bravechamp/patch-1  
						
						... 
						
						
						
						Fix API access 
						
					 
					
						2022-03-15 14:53:23 +01:00 
						 
				 
			
				
					
						
							
							
								bravechamp 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0bfa5302a7 
							
						 
					 
					
						
						
							
							Fix API access  
						
						... 
						
						
						
						By allowing API keys to be validated 
						
					 
					
						2022-03-15 16:05:56 +03:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							b8aad5451d 
							
						 
					 
					
						
						
							
							Make STUN run by default when embedded DERP is enabled  
						
						... 
						
						
						
						This commit also allows to set an external STUN server, while running the embedded DERP server (without embedded STUN) 
						
					 
					
						2022-03-15 13:22:25 +01:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							61440c42d3 
							
						 
					 
					
						
						
							
							Merge pull request  #496  from juanfont/update-contributors  
						
						... 
						
						
						
						docs(README): update contributors 
						
					 
					
						2022-03-10 19:58:24 +00:00 
						 
				 
			
				
					
						
							
							
								github-actions[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							18ee6274e1 
							
						 
					 
					
						
						
							
							docs(README): update contributors  
						
						
						
					 
					
						2022-03-10 19:50:59 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0abfbdc18a 
							
						 
					 
					
						
						
							
							Merge pull request  #495  from appbricks/appbricks/main-bug-fix  
						
						... 
						
						
						
						Regression bug fix when re-authenticating machine with auth-key 
						
					 
					
						2022-03-10 19:50:23 +00:00 
						 
				 
			
				
					
						
							
							
								Mevan Samaratunga 
							
						 
					 
					
						
						
						
						
							
						
						
							082a852c5e 
							
						 
					 
					
						
						
							
							fixed linting recommendation  
						
						
						
					 
					
						2022-03-10 10:40:20 -05:00 
						 
				 
			
				
					
						
							
							
								Mevan Samaratunga 
							
						 
					 
					
						
						
						
						
							
						
						
							af081e9fd3 
							
						 
					 
					
						
						
							
							fixed lint errors  
						
						
						
					 
					
						2022-03-10 10:22:21 -05:00 
						 
				 
			
				
					
						
							
							
								Mevan Samaratunga 
							
						 
					 
					
						
						
						
						
							
						
						
							8b5e8b7dfc 
							
						 
					 
					
						
						
							
							Refresh expired machine on re-auth -  closes   #489  
						
						
						
					 
					
						2022-03-10 08:59:28 -05:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							62d7fae056 
							
						 
					 
					
						
						
							
							Merge pull request  #311  from restanrm/docs-acl-modifications  
						
						... 
						
						
						
						Issues with current ACL implementation and solution proposal 
						
					 
					
						2022-03-08 17:08:17 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd219d0ff6 
							
						 
					 
					
						
						
							
							Merge branch 'main' into docs-acl-modifications  
						
						
						
					 
					
						2022-03-08 17:05:59 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6087e1cf6f 
							
						 
					 
					
						
						
							
							Merge pull request  #488  from juanfont/update-contributors  
						
						
						
					 
					
						2022-03-08 17:02:47 +00:00 
						 
				 
			
				
					
						
							
							
								github-actions[bot] 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c47fb1ae54 
							
						 
					 
					
						
						
							
							docs(README): update contributors  
						
						
						
					 
					
						2022-03-08 16:50:11 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48cec3cd90 
							
						 
					 
					
						
						
							
							Merge pull request  #486  from e-zk/main  
						
						
						
					 
					
						2022-03-08 16:49:32 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e54c508c10 
							
						 
					 
					
						
						
							
							Merge branch 'main' into main  
						
						
						
					 
					
						2022-03-08 16:05:41 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							941e9d9b0f 
							
						 
					 
					
						
						
							
							Merge pull request  #388  from juanfont/embedded-derp  
						
						
						
					 
					
						2022-03-08 16:05:30 +00:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							b803240dc1 
							
						 
					 
					
						
						
							
							Added new line for prettier  
						
						
						
					 
					
						2022-03-08 12:21:08 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbf620ece 
							
						 
					 
					
						
						
							
							Merge branch 'embedded-derp' of  https://github.com/juanfont/headscale  into embedded-derp  
						
						
						
					 
					
						2022-03-08 12:16:43 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5d22b8a70 
							
						 
					 
					
						
						
							
							Merge branch 'main' into embedded-derp  
						
						
						
					 
					
						2022-03-08 12:16:34 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							05c5e2280b 
							
						 
					 
					
						
						
							
							Updated CHANGELOG and README  
						
						
						
					 
					
						2022-03-08 12:15:05 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							b41d89946a 
							
						 
					 
					
						
						
							
							Merge branch 'embedded-derp' of  https://github.com/juanfont/headscale  into embedded-derp  
						
						
						
					 
					
						2022-03-08 12:11:59 +01:00 
						 
				 
			
				
					
						
							
							
								Juan Font Alonso 
							
						 
					 
					
						
						
						
						
							
						
						
							cc0c88a63a 
							
						 
					 
					
						
						
							
							Added small integration test for stun  
						
						
						
					 
					
						2022-03-08 12:11:51 +01:00 
						 
				 
			
				
					
						
							
							
								e-zk 
							
						 
					 
					
						
						
						
						
							
						
						
							c06689dec1 
							
						 
					 
					
						
						
							
							fix: make register html/template consistent with other html  
						
						... 
						
						
						
						- makes the html/template for /register follow the same formatting
  as /apple and /windows
- adds a <title> element
- minor change for consistency's sake 
						
					 
					
						2022-03-08 18:34:46 +10:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b85dd7abbd 
							
						 
					 
					
						
						
							
							Merge pull request  #484  from juanfont/prtemplate-fix  
						
						... 
						
						
						
						Fix checkboxes in PR template 
						
					 
					
						2022-03-08 07:29:30 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6aeaff43aa 
							
						 
					 
					
						
						
							
							Fix checkboxes in PR template  
						
						
						
					 
					
						2022-03-08 07:21:04 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dd26cbd193 
							
						 
					 
					
						
						
							
							Merge branch 'main' into embedded-derp  
						
						
						
					 
					
						2022-03-08 07:18:51 +00:00 
						 
				 
			
				
					
						
							
							
								Kristoffer Dalby 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b0ae3240fd 
							
						 
					 
					
						
						
							
							Merge pull request  #387  from restanrm/fix-magic-dns-and-uppercase-letters  
						
						... 
						
						
						
						Fix magic dns and uppercase letters 
						
					 
					
						2022-03-08 07:17:45 +00:00