diff --git a/src/cmd/collerd/README.md b/src/cmd/collerd/README.md index 9c0aae1..182e3c7 100644 --- a/src/cmd/collerd/README.md +++ b/src/cmd/collerd/README.md @@ -41,6 +41,7 @@ The file format is **JSON**: * **tls_key_file** (string): Path to TLS key file to enable HTTPS * **ace_directory** (string): Serve [Ace](hhttps://ace.c9.io/) assets from this local directory (ex: "./node_modules/ace-builds"). See **Dependencies** for details. * **bootstrap_directory** (string): Serve [Bootstrap](https://getbootstrap.com/) assets from this local directory (ex: "./node_modules/bootstrap/dist"). See **Dependencies** for details. +* **clients_directory** (string): Serve clients binaries from this local directory (ex: "./releases/1.2.0") * **disable_editor** (bool): Disable Ace editor. The configuration file is not required but the service might not be exposed to the public. diff --git a/src/server/config.go b/src/server/config.go index bb27bd2..a25752f 100644 --- a/src/server/config.go +++ b/src/server/config.go @@ -34,6 +34,7 @@ type Config struct { AceDirectory string `json:"ace_directory"` BootstrapDirectory string `json:"bootstrap_directory"` DisableEditor bool `json:"disable_editor"` + ClientsDirectory string `json:"clients_directory"` } func NewConfig() *Config { diff --git a/src/server/handlers_api.go b/src/server/handlers_api.go index 09adb3c..0912718 100644 --- a/src/server/handlers_api.go +++ b/src/server/handlers_api.go @@ -232,8 +232,9 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } type ClientHandler struct { - logger *slog.Logger - version string + logger *slog.Logger + version string + directory string } func (h *ClientHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { @@ -253,5 +254,9 @@ func (h *ClientHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { version = "latest" } - http.Redirect(w, r, fmt.Sprintf("https://git.riou.xyz/jriou/coller/releases/download/%s/%s-%s-%s", version, clientName, os, arch), http.StatusMovedPermanently) + if h.directory != "" { + http.ServeFile(w, r, h.directory+"/"+fmt.Sprintf("%s-%s-%s", clientName, os, arch)) + } else { + http.Redirect(w, r, fmt.Sprintf("https://git.riou.xyz/jriou/coller/releases/download/%s/%s-%s-%s", version, clientName, os, arch), http.StatusMovedPermanently) + } } diff --git a/src/server/server.go b/src/server/server.go index 8443f22..2c8f2b0 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -133,8 +133,9 @@ func (s *Server) Start() error { r.Path("/clients.html").Handler(clientsHandler).Methods("GET") clientHandler := &ClientHandler{ - logger: s.logger, - version: p.Version, + logger: s.logger, + version: p.Version, + directory: s.config.ClientsDirectory, } r.Path("/clients/{os:[a-z]+}-{arch:[a-z0-9]+}/{clientName:[a-z]+}").Handler(clientHandler).Methods("GET")