aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--forged/internal/global/global.go2
-rw-r--r--forged/internal/incoming/hooks/hooks.go6
-rw-r--r--forged/internal/incoming/lmtp/lmtp.go6
-rw-r--r--forged/internal/incoming/ssh/ssh.go10
-rw-r--r--forged/internal/incoming/web/handler.go4
-rw-r--r--forged/internal/incoming/web/router.go4
-rw-r--r--forged/internal/incoming/web/server.go8
-rw-r--r--forged/internal/incoming/web/types/types.go2
-rw-r--r--forged/internal/server/server.go14
9 files changed, 28 insertions, 28 deletions
diff --git a/forged/internal/global/global.go b/forged/internal/global/global.go
index 7d2f03f..2aa8049 100644
--- a/forged/internal/global/global.go
+++ b/forged/internal/global/global.go
@@ -1,6 +1,6 @@
package global
-type GlobalData struct {
+type Global struct {
ForgeTitle string
ForgeVersion string
SSHPubkey string
diff --git a/forged/internal/incoming/hooks/hooks.go b/forged/internal/incoming/hooks/hooks.go
index 941b03f..dfdf172 100644
--- a/forged/internal/incoming/hooks/hooks.go
+++ b/forged/internal/incoming/hooks/hooks.go
@@ -17,7 +17,7 @@ type Server struct {
hookMap cmap.Map[string, hookInfo]
socketPath string
executablesPath string
- globalData *global.GlobalData
+ global *global.Global
}
type hookInfo struct {
session ssh.Session
@@ -32,12 +32,12 @@ type hookInfo struct {
contribReq string
}
-func New(config Config, globalData *global.GlobalData) (server *Server) {
+func New(config Config, global *global.Global) (server *Server) {
return &Server{
socketPath: config.Socket,
executablesPath: config.Execs,
hookMap: cmap.Map[string, hookInfo]{},
- globalData: globalData,
+ global: global,
}
}
diff --git a/forged/internal/incoming/lmtp/lmtp.go b/forged/internal/incoming/lmtp/lmtp.go
index d7e5ef4..a7782a2 100644
--- a/forged/internal/incoming/lmtp/lmtp.go
+++ b/forged/internal/incoming/lmtp/lmtp.go
@@ -17,17 +17,17 @@ type Server struct {
maxSize int64
writeTimeout uint32
readTimeout uint32
- globalData *global.GlobalData
+ global *global.Global
}
-func New(config Config, globalData *global.GlobalData) (server *Server) {
+func New(config Config, global *global.Global) (server *Server) {
return &Server{
socket: config.Socket,
domain: config.Domain,
maxSize: config.MaxSize,
writeTimeout: config.WriteTimeout,
readTimeout: config.ReadTimeout,
- globalData: globalData,
+ global: global,
}
}
diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go
index dc03501..527cd28 100644
--- a/forged/internal/incoming/ssh/ssh.go
+++ b/forged/internal/incoming/ssh/ssh.go
@@ -20,16 +20,16 @@ type Server struct {
addr string
root string
shutdownTimeout uint32
- globalData *global.GlobalData
+ global *global.Global
}
-func New(config Config, globalData *global.GlobalData) (server *Server, err error) {
+func New(config Config, global *global.Global) (server *Server, err error) {
server = &Server{
net: config.Net,
addr: config.Addr,
root: config.Root,
shutdownTimeout: config.ShutdownTimeout,
- globalData: globalData,
+ global: global,
} //exhaustruct:ignore
var privkeyBytes []byte
@@ -44,8 +44,8 @@ func New(config Config, globalData *global.GlobalData) (server *Server, err erro
return server, fmt.Errorf("parse SSH private key: %w", err)
}
- server.globalData.SSHPubkey = misc.BytesToString(gossh.MarshalAuthorizedKey(server.privkey.PublicKey()))
- server.globalData.SSHFingerprint = gossh.FingerprintSHA256(server.privkey.PublicKey())
+ server.global.SSHPubkey = misc.BytesToString(gossh.MarshalAuthorizedKey(server.privkey.PublicKey()))
+ server.global.SSHFingerprint = gossh.FingerprintSHA256(server.privkey.PublicKey())
server.gliderServer = &gliderssh.Server{
Handler: handle,
diff --git a/forged/internal/incoming/web/handler.go b/forged/internal/incoming/web/handler.go
index bc50b33..63019b4 100644
--- a/forged/internal/incoming/web/handler.go
+++ b/forged/internal/incoming/web/handler.go
@@ -16,8 +16,8 @@ type handler struct {
r *Router
}
-func NewHandler(cfg Config, globalData *global.GlobalData, queries *queries.Queries) *handler {
- h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(globalData).Queries(queries)}
+func NewHandler(cfg Config, global *global.Global, queries *queries.Queries) *handler {
+ h := &handler{r: NewRouter().ReverseProxy(cfg.ReverseProxy).Global(global).Queries(queries)}
staticFS := http.FileServer(http.Dir(cfg.StaticPath))
h.r.ANYHTTP("-/static/*rest",
diff --git a/forged/internal/incoming/web/router.go b/forged/internal/incoming/web/router.go
index 7c2717d..c1a0bc0 100644
--- a/forged/internal/incoming/web/router.go
+++ b/forged/internal/incoming/web/router.go
@@ -60,14 +60,14 @@ type Router struct {
routes []route
errors ErrorRenderers
user UserResolver
- global *global.GlobalData
+ global *global.Global
reverseProxy bool
queries *queries.Queries
}
func NewRouter() *Router { return &Router{} }
-func (r *Router) Global(g *global.GlobalData) *Router {
+func (r *Router) Global(g *global.Global) *Router {
r.global = g
return r
}
diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go
index f81886f..465657c 100644
--- a/forged/internal/incoming/web/server.go
+++ b/forged/internal/incoming/web/server.go
@@ -19,12 +19,12 @@ type Server struct {
root string
httpServer *http.Server
shutdownTimeout uint32
- globalData *global.GlobalData
+ global *global.Global
}
-func New(config Config, globalData *global.GlobalData, queries *queries.Queries) *Server {
+func New(config Config, global *global.Global, queries *queries.Queries) *Server {
httpServer := &http.Server{
- Handler: NewHandler(config, globalData, queries),
+ Handler: NewHandler(config, global, queries),
ReadTimeout: time.Duration(config.ReadTimeout) * time.Second,
WriteTimeout: time.Duration(config.WriteTimeout) * time.Second,
IdleTimeout: time.Duration(config.IdleTimeout) * time.Second,
@@ -36,7 +36,7 @@ func New(config Config, globalData *global.GlobalData, queries *queries.Queries)
root: config.Root,
shutdownTimeout: config.ShutdownTimeout,
httpServer: httpServer,
- globalData: globalData,
+ global: global,
}
}
diff --git a/forged/internal/incoming/web/types/types.go b/forged/internal/incoming/web/types/types.go
index 1301fe9..bacce24 100644
--- a/forged/internal/incoming/web/types/types.go
+++ b/forged/internal/incoming/web/types/types.go
@@ -19,7 +19,7 @@ type BaseData struct {
SeparatorIndex int
RefType string
RefName string
- Global *global.GlobalData
+ Global *global.Global
Queries *queries.Queries
}
diff --git a/forged/internal/server/server.go b/forged/internal/server/server.go
index ecd5fe1..62a9442 100644
--- a/forged/internal/server/server.go
+++ b/forged/internal/server/server.go
@@ -24,7 +24,7 @@ type Server struct {
webServer *web.Server
sshServer *ssh.Server
- globalData global.GlobalData
+ global global.Global
}
func New(configPath string) (server *Server, err error) {
@@ -37,13 +37,13 @@ func New(configPath string) (server *Server, err error) {
queries := queries.New(&server.database)
- server.globalData.ForgeVersion = "unknown" // TODO
- server.globalData.ForgeTitle = server.config.General.Title
+ server.global.ForgeVersion = "unknown" // TODO
+ server.global.ForgeTitle = server.config.General.Title
- server.hookServer = hooks.New(server.config.Hooks, &server.globalData)
- server.lmtpServer = lmtp.New(server.config.LMTP, &server.globalData)
- server.webServer = web.New(server.config.Web, &server.globalData, queries)
- server.sshServer, err = ssh.New(server.config.SSH, &server.globalData)
+ server.hookServer = hooks.New(server.config.Hooks, &server.global)
+ server.lmtpServer = lmtp.New(server.config.LMTP, &server.global)
+ server.webServer = web.New(server.config.Web, &server.global, queries)
+ server.sshServer, err = ssh.New(server.config.SSH, &server.global)
if err != nil {
return server, fmt.Errorf("create SSH server: %w", err)
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-18 22:00:54 +0000