Move all config typedefs to config.go

12 files changed, 56 insertions, 51 deletions

diff --git a/forged/internal/database/config.go b/forged/internal/database/config.go
new file mode 100644
index 0000000..3697693
--- /dev/null
+++ b/forged/internal/database/config.go
@@ -0,0 +1,5 @@
+package database
+
+type Config struct {
+	Conn string `scfg:"conn"`
+}
diff --git a/forged/internal/database/database.go b/forged/internal/database/database.go
index 92244b7..093ed8f 100644
--- a/forged/internal/database/database.go
+++ b/forged/internal/database/database.go
@@ -27,7 +27,3 @@ func Open(ctx context.Context, config Config) (Database, error) {
 	}
 	return Database{db}, err
 }
-
-type Config struct {
-	Conn string `scfg:"conn"`
-}
diff --git a/forged/internal/incoming/hooks/config.go b/forged/internal/incoming/hooks/config.go
new file mode 100644
index 0000000..0d23dc0
--- /dev/null
+++ b/forged/internal/incoming/hooks/config.go
@@ -0,0 +1,6 @@
+package hooks
+
+type Config struct {
+	Socket string `scfg:"socket"`
+	Execs  string `scfg:"execs"`
+}
diff --git a/forged/internal/incoming/hooks/hooks.go b/forged/internal/incoming/hooks/hooks.go
index 4400b61..d0f57f5 100644
--- a/forged/internal/incoming/hooks/hooks.go
+++ b/forged/internal/incoming/hooks/hooks.go
@@ -17,12 +17,6 @@ type Server struct {
 	socketPath      string
 	executablesPath string
 }
-
-type Config struct {
-	Socket string `scfg:"socket"`
-	Execs  string `scfg:"execs"`
-}
-
 type hookInfo struct {
 	session      ssh.Session
 	pubkey       string
diff --git a/forged/internal/incoming/lmtp/config.go b/forged/internal/incoming/lmtp/config.go
new file mode 100644
index 0000000..6241608
--- /dev/null
+++ b/forged/internal/incoming/lmtp/config.go
@@ -0,0 +1,9 @@
+package lmtp
+
+type Config struct {
+	Socket       string `scfg:"socket"`
+	Domain       string `scfg:"domain"`
+	MaxSize      int64  `scfg:"max_size"`
+	WriteTimeout uint32 `scfg:"write_timeout"`
+	ReadTimeout  uint32 `scfg:"read_timeout"`
+}
diff --git a/forged/internal/incoming/lmtp/lmtp.go b/forged/internal/incoming/lmtp/lmtp.go
index 429ff20..61b1caf 100644
--- a/forged/internal/incoming/lmtp/lmtp.go
+++ b/forged/internal/incoming/lmtp/lmtp.go
@@ -18,14 +18,6 @@ type Server struct {
 	readTimeout  uint32
 }
 
-type Config struct {
-	Socket       string `scfg:"socket"`
-	Domain       string `scfg:"domain"`
-	MaxSize      int64  `scfg:"max_size"`
-	WriteTimeout uint32 `scfg:"write_timeout"`
-	ReadTimeout  uint32 `scfg:"read_timeout"`
-}
-
 func New(config Config) (server *Server) {
 	return &Server{
 		socket:       config.Socket,
diff --git a/forged/internal/incoming/ssh/config.go b/forged/internal/incoming/ssh/config.go
new file mode 100644
index 0000000..7d22cc1
--- /dev/null
+++ b/forged/internal/incoming/ssh/config.go
@@ -0,0 +1,9 @@
+package ssh
+
+type Config struct {
+	Net             string `scfg:"net"`
+	Addr            string `scfg:"addr"`
+	Key             string `scfg:"key"`
+	Root            string `scfg:"root"`
+	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
+}
diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go
index a0cce5e..9338eca 100644
--- a/forged/internal/incoming/ssh/ssh.go
+++ b/forged/internal/incoming/ssh/ssh.go
@@ -12,14 +12,6 @@ import (
 	gossh "golang.org/x/crypto/ssh"
 )
 
-type Config struct {
-	Net             string `scfg:"net"`
-	Addr            string `scfg:"addr"`
-	Key             string `scfg:"key"`
-	Root            string `scfg:"root"`
-	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
-}
-
 type Server struct {
 	gliderServer    *gliderssh.Server
 	privkey         gossh.Signer
diff --git a/forged/internal/incoming/web/config.go b/forged/internal/incoming/web/config.go
new file mode 100644
index 0000000..63a7f37
--- /dev/null
+++ b/forged/internal/incoming/web/config.go
@@ -0,0 +1,14 @@
+package web
+
+type Config struct {
+	Net             string `scfg:"net"`
+	Addr            string `scfg:"addr"`
+	Root            string `scfg:"root"`
+	CookieExpiry    int    `scfg:"cookie_expiry"`
+	ReadTimeout     uint32 `scfg:"read_timeout"`
+	WriteTimeout    uint32 `scfg:"write_timeout"`
+	IdleTimeout     uint32 `scfg:"idle_timeout"`
+	MaxHeaderBytes  int    `scfg:"max_header_bytes"`
+	ReverseProxy    bool   `scfg:"reverse_proxy"`
+	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
+}
diff --git a/forged/internal/incoming/web/server.go b/forged/internal/incoming/web/server.go
index a965251..6229bf0 100644
--- a/forged/internal/incoming/web/server.go
+++ b/forged/internal/incoming/web/server.go
@@ -19,19 +19,6 @@ type Server struct {
 	shutdownTimeout uint32
 }
 
-type Config struct {
-	Net             string `scfg:"net"`
-	Addr            string `scfg:"addr"`
-	Root            string `scfg:"root"`
-	CookieExpiry    int    `scfg:"cookie_expiry"`
-	ReadTimeout     uint32 `scfg:"read_timeout"`
-	WriteTimeout    uint32 `scfg:"write_timeout"`
-	IdleTimeout     uint32 `scfg:"idle_timeout"`
-	MaxHeaderBytes  int    `scfg:"max_header_bytes"`
-	ReverseProxy    bool   `scfg:"reverse_proxy"`
-	ShutdownTimeout uint32 `scfg:"shutdown_timeout"`
-}
-
 func New(config Config) (server *Server) {
 	httpServer := &http.Server{
 		Handler:        NewHandler(config),
diff --git a/forged/internal/ipc/irc/bot.go b/forged/internal/ipc/irc/bot.go
index c7a188b..07008ae 100644
--- a/forged/internal/ipc/irc/bot.go
+++ b/forged/internal/ipc/irc/bot.go
@@ -13,18 +13,6 @@ import (
 	"go.lindenii.runxiyu.org/forge/forged/internal/common/misc"
 )
 
-// Config contains IRC connection and identity settings for the bot.
-// This should usually be a part of the primary config struct.
-type Config struct {
-	Net   string `scfg:"net"`
-	Addr  string `scfg:"addr"`
-	TLS   bool   `scfg:"tls"`
-	SendQ uint   `scfg:"sendq"`
-	Nick  string `scfg:"nick"`
-	User  string `scfg:"user"`
-	Gecos string `scfg:"gecos"`
-}
-
 // Bot represents an IRC bot client that handles events and allows for sending messages.
 type Bot struct {
 	// TODO: Use each config field instead of embedding Config here.
diff --git a/forged/internal/ipc/irc/config.go b/forged/internal/ipc/irc/config.go
new file mode 100644
index 0000000..b1b5703
--- /dev/null
+++ b/forged/internal/ipc/irc/config.go
@@ -0,0 +1,13 @@
+package irc
+
+// Config contains IRC connection and identity settings for the bot.
+// This should usually be a part of the primary config struct.
+type Config struct {
+	Net   string `scfg:"net"`
+	Addr  string `scfg:"addr"`
+	TLS   bool   `scfg:"tls"`
+	SendQ uint   `scfg:"sendq"`
+	Nick  string `scfg:"nick"`
+	User  string `scfg:"user"`
+	Gecos string `scfg:"gecos"`
+}