diff options
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | go.sum | 4 | ||||
-rw-r--r-- | main.go | 27 |
3 files changed, 14 insertions, 19 deletions
@@ -3,6 +3,7 @@ module code.crute.us/mcrute/ssh-proxy | |||
3 | go 1.20 | 3 | go 1.20 |
4 | 4 | ||
5 | require ( | 5 | require ( |
6 | code.crute.us/mcrute/golib v0.6.1 | ||
6 | code.crute.us/mcrute/golib/cli v0.2.2 | 7 | code.crute.us/mcrute/golib/cli v0.2.2 |
7 | code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0 | 8 | code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0 |
8 | code.crute.us/mcrute/golib/clients/netbox/v3 v3.2.0 | 9 | code.crute.us/mcrute/golib/clients/netbox/v3 v3.2.0 |
@@ -21,7 +22,6 @@ require ( | |||
21 | ) | 22 | ) |
22 | 23 | ||
23 | require ( | 24 | require ( |
24 | code.crute.us/mcrute/golib v0.6.0 // indirect | ||
25 | code.crute.us/mcrute/golib/clients/dns v0.1.0 // indirect | 25 | code.crute.us/mcrute/golib/clients/dns v0.1.0 // indirect |
26 | code.crute.us/mcrute/golib/clients/netbox v0.1.0 // indirect | 26 | code.crute.us/mcrute/golib/clients/netbox v0.1.0 // indirect |
27 | code.crute.us/mcrute/golib/vault v0.2.4 // indirect | 27 | code.crute.us/mcrute/golib/vault v0.2.4 // indirect |
@@ -30,8 +30,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo | |||
30 | cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= | 30 | cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= |
31 | cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= | 31 | cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= |
32 | cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= | 32 | cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= |
33 | code.crute.us/mcrute/golib v0.6.0 h1:36+rTs5Z7lKjXpsgKhyKsOl9S2pHRcxK+D9ytbbTqGw= | 33 | code.crute.us/mcrute/golib v0.6.1 h1:Ldrc5Fgs6vufiFpIfwb+YpC5gID9RacHxWRPUvyeTzQ= |
34 | code.crute.us/mcrute/golib v0.6.0/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s= | 34 | code.crute.us/mcrute/golib v0.6.1/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s= |
35 | code.crute.us/mcrute/golib/cli v0.2.2 h1:1MgyEYCyZ2oJBs/FrztMmxJoh0v+7j21VsWXBTIWsqw= | 35 | code.crute.us/mcrute/golib/cli v0.2.2 h1:1MgyEYCyZ2oJBs/FrztMmxJoh0v+7j21VsWXBTIWsqw= |
36 | code.crute.us/mcrute/golib/cli v0.2.2/go.mod h1:vc2TpQ5J/3zRfcWq6sclmU0EmJI8xygpOij77VJ8EK8= | 36 | code.crute.us/mcrute/golib/cli v0.2.2/go.mod h1:vc2TpQ5J/3zRfcWq6sclmU0EmJI8xygpOij77VJ8EK8= |
37 | code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0 h1:Vy/DhmVWNF8be9jeyO/oMRtPxBVGwWXFyicBudFMv4E= | 37 | code.crute.us/mcrute/golib/clients/autocert/v2 v2.2.0 h1:Vy/DhmVWNF8be9jeyO/oMRtPxBVGwWXFyicBudFMv4E= |
@@ -5,7 +5,6 @@ package main | |||
5 | import ( | 5 | import ( |
6 | "embed" | 6 | "embed" |
7 | "fmt" | 7 | "fmt" |
8 | "io/fs" | ||
9 | "log" | 8 | "log" |
10 | 9 | ||
11 | "code.crute.us/mcrute/ssh-proxy/app" | 10 | "code.crute.us/mcrute/ssh-proxy/app" |
@@ -14,6 +13,7 @@ import ( | |||
14 | "code.crute.us/mcrute/ssh-proxy/cmd/web" | 13 | "code.crute.us/mcrute/ssh-proxy/cmd/web" |
15 | 14 | ||
16 | "code.crute.us/mcrute/golib/cli" | 15 | "code.crute.us/mcrute/golib/cli" |
16 | "code.crute.us/mcrute/golib/fs" | ||
17 | 17 | ||
18 | "github.com/spf13/cobra" | 18 | "github.com/spf13/cobra" |
19 | 19 | ||
@@ -23,30 +23,25 @@ import ( | |||
23 | ) | 23 | ) |
24 | 24 | ||
25 | //go:embed templates | 25 | //go:embed templates |
26 | var embeddedTemplates embed.FS | 26 | var templates embed.FS |
27 | 27 | ||
28 | //go:embed clients | 28 | //go:embed clients |
29 | var embeddedClients embed.FS | 29 | var clients embed.FS |
30 | 30 | ||
31 | var appVersion string | 31 | var version string |
32 | 32 | ||
33 | func main() { | 33 | func main() { |
34 | rootCmd := &cobra.Command{ | 34 | r := &cobra.Command{ |
35 | Use: "web-server", | 35 | Use: "web-server", |
36 | Short: fmt.Sprintf("SSH proxy web server (version %s)", appVersion), | 36 | Short: fmt.Sprintf("SSH proxy web server (version %s)", version), |
37 | } | 37 | } |
38 | cli.AddFlags(rootCmd, &app.Config{}, app.DefaultConfig, "") | 38 | cli.AddFlags(r, &app.Config{}, app.DefaultConfig, "") |
39 | 39 | ||
40 | templates, err := fs.Sub(embeddedTemplates, "templates") | 40 | web.Register(r, fs.MustSub(templates, "templates"), clients, version) |
41 | if err != nil { | 41 | client.Register(r, version) |
42 | log.Fatalf("Error building sub-fs of embeded fs") | 42 | register.Register(r) |
43 | } | ||
44 | |||
45 | web.Register(rootCmd, templates, embeddedClients, appVersion) | ||
46 | client.Register(rootCmd, appVersion) | ||
47 | register.Register(rootCmd) | ||
48 | 43 | ||
49 | if err := rootCmd.Execute(); err != nil { | 44 | if err := r.Execute(); err != nil { |
50 | log.Fatalf("Error running root command: %s", err) | 45 | log.Fatalf("Error running root command: %s", err) |
51 | } | 46 | } |
52 | } | 47 | } |