TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-27 03:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from juanfont/node-cmd-improve

Browse Source 
List nodes in namespace + register under node command
This commit is contained in:
Juan Font 2021-05-02 23:04:46 +02:00 committed by GitHub
commit 13f809be87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -78,7 +78,7 @@ Suggestions/PRs welcomed!
8. In the server, register your machine to a namespace with the CLI
```shell
./headscale -n myfirstnamespace register YOURMACHINEKEY
./headscale -n myfirstnamespace node register YOURMACHINEKEY
```
## Configuration reference

2
api.go
View File

@ -43,7 +43,7 @@ func (h *Headscale) RegisterWebAPI(c *gin.Context) {
<p>
<code>
<b>headscale register %s</b>
<b>headscale -n NAMESPACE node register %s</b>
</code>
</p>

26
cmd/headscale/cli/nodes.go
View File

@ -35,6 +35,32 @@ var RegisterCmd = &cobra.Command{
},
}
var ListNodesCmd = &cobra.Command{
Use: "list",
Short: "List the nodes in a given namespace",
Run: func(cmd *cobra.Command, args []string) {
n, err := cmd.Flags().GetString("namespace")
if err != nil {
log.Fatalf("Error getting namespace: %s", err)
}
h, err := getHeadscaleApp()
if err != nil {
log.Fatalf("Error initializing: %s", err)
}
machines, err := h.ListMachinesInNamespace(n)
if err != nil {
log.Fatalf("Error getting nodes: %s", err)
}
fmt.Printf("name\t\tlast seen\n")
for _, m := range *machines {
fmt.Printf("%s\t%s\n", m.Name, m.LastSeen.Format("2006-01-02 15:04:05"))
}
},
}
var NodeCmd = &cobra.Command{
Use: "node",
Short: "Manage the nodes of Headscale",

10
cmd/headscale/headscale.go
View File

@ -86,7 +86,6 @@ func main() {
headscaleCmd.AddCommand(cli.NamespaceCmd)
headscaleCmd.AddCommand(cli.NodeCmd)
headscaleCmd.AddCommand(cli.PreauthkeysCmd)
headscaleCmd.AddCommand(cli.RegisterCmd)
headscaleCmd.AddCommand(cli.RoutesCmd)
headscaleCmd.AddCommand(cli.ServeCmd)
headscaleCmd.AddCommand(versionCmd)
@ -103,12 +102,6 @@ func main() {
log.Fatalf(err.Error())
}
cli.RegisterCmd.PersistentFlags().StringP("namespace", "n", "", "Namespace")
err = cli.RegisterCmd.MarkPersistentFlagRequired("namespace")
if err != nil {
log.Fatalf(err.Error())
}
cli.RoutesCmd.PersistentFlags().StringP("namespace", "n", "", "Namespace")
err = cli.RoutesCmd.MarkPersistentFlagRequired("namespace")
if err != nil {
@ -118,6 +111,9 @@ func main() {
cli.NamespaceCmd.AddCommand(cli.CreateNamespaceCmd)
cli.NamespaceCmd.AddCommand(cli.ListNamespacesCmd)
cli.NodeCmd.AddCommand(cli.ListNodesCmd)
cli.NodeCmd.AddCommand(cli.RegisterCmd)
cli.RoutesCmd.AddCommand(cli.ListRoutesCmd)
cli.RoutesCmd.AddCommand(cli.EnableRouteCmd)