diff --git a/cmd/maddyctl/appendlimit.go b/cmd/maddyctl/appendlimit.go index cd03623..71f1c69 100644 --- a/cmd/maddyctl/appendlimit.go +++ b/cmd/maddyctl/appendlimit.go @@ -5,7 +5,7 @@ import ( "fmt" appendlimit "github.com/emersion/go-imap-appendlimit" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/urfave/cli" ) diff --git a/cmd/maddyctl/imap.go b/cmd/maddyctl/imap.go index 426cee5..029e37b 100644 --- a/cmd/maddyctl/imap.go +++ b/cmd/maddyctl/imap.go @@ -12,7 +12,7 @@ import ( "github.com/emersion/go-imap" imapsql "github.com/foxcpp/go-imap-sql" "github.com/foxcpp/maddy/cmd/maddyctl/clitools" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/urfave/cli" ) diff --git a/cmd/maddyctl/imapacct.go b/cmd/maddyctl/imapacct.go index 0dc43da..ef4dd96 100644 --- a/cmd/maddyctl/imapacct.go +++ b/cmd/maddyctl/imapacct.go @@ -7,7 +7,7 @@ import ( specialuse "github.com/emersion/go-imap-specialuse" "github.com/foxcpp/maddy/cmd/maddyctl/clitools" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/urfave/cli" ) diff --git a/cmd/maddyctl/main.go b/cmd/maddyctl/main.go index 2898368..558b58e 100644 --- a/cmd/maddyctl/main.go +++ b/cmd/maddyctl/main.go @@ -8,11 +8,11 @@ import ( "path/filepath" "github.com/foxcpp/maddy" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/module" + parser "github.com/foxcpp/maddy/framework/cfgparser" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/updatepipe" - parser "github.com/foxcpp/maddy/pkg/cfgparser" "github.com/urfave/cli" "golang.org/x/crypto/bcrypt" ) diff --git a/cmd/maddyctl/users.go b/cmd/maddyctl/users.go index 34ca251..536e994 100644 --- a/cmd/maddyctl/users.go +++ b/cmd/maddyctl/users.go @@ -6,7 +6,7 @@ import ( "os" "github.com/foxcpp/maddy/cmd/maddyctl/clitools" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/urfave/cli" ) diff --git a/config.go b/config.go index fb37552..86f418e 100644 --- a/config.go +++ b/config.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" ) /* diff --git a/internal/address/doc.go b/framework/address/doc.go similarity index 100% rename from internal/address/doc.go rename to framework/address/doc.go diff --git a/internal/address/norm.go b/framework/address/norm.go similarity index 98% rename from internal/address/norm.go rename to framework/address/norm.go index e706f8f..f85ace8 100644 --- a/internal/address/norm.go +++ b/framework/address/norm.go @@ -4,7 +4,7 @@ import ( "strings" "unicode/utf8" - "github.com/foxcpp/maddy/internal/dns" + "github.com/foxcpp/maddy/framework/dns" "golang.org/x/net/idna" "golang.org/x/text/unicode/norm" ) diff --git a/internal/address/norm_test.go b/framework/address/norm_test.go similarity index 100% rename from internal/address/norm_test.go rename to framework/address/norm_test.go diff --git a/internal/address/rfc6531.go b/framework/address/rfc6531.go similarity index 100% rename from internal/address/rfc6531.go rename to framework/address/rfc6531.go diff --git a/internal/address/rfc6531_test.go b/framework/address/rfc6531_test.go similarity index 100% rename from internal/address/rfc6531_test.go rename to framework/address/rfc6531_test.go diff --git a/internal/address/split.go b/framework/address/split.go similarity index 100% rename from internal/address/split.go rename to framework/address/split.go diff --git a/internal/address/split_test.go b/framework/address/split_test.go similarity index 100% rename from internal/address/split_test.go rename to framework/address/split_test.go diff --git a/internal/address/validation.go b/framework/address/validation.go similarity index 100% rename from internal/address/validation.go rename to framework/address/validation.go diff --git a/internal/buffer/buffer.go b/framework/buffer/buffer.go similarity index 100% rename from internal/buffer/buffer.go rename to framework/buffer/buffer.go diff --git a/internal/buffer/bytesreader.go b/framework/buffer/bytesreader.go similarity index 100% rename from internal/buffer/bytesreader.go rename to framework/buffer/bytesreader.go diff --git a/internal/buffer/file.go b/framework/buffer/file.go similarity index 100% rename from internal/buffer/file.go rename to framework/buffer/file.go diff --git a/internal/buffer/memory.go b/framework/buffer/memory.go similarity index 100% rename from internal/buffer/memory.go rename to framework/buffer/memory.go diff --git a/pkg/cfgparser/env.go b/framework/cfgparser/env.go similarity index 100% rename from pkg/cfgparser/env.go rename to framework/cfgparser/env.go diff --git a/pkg/cfgparser/imports.go b/framework/cfgparser/imports.go similarity index 100% rename from pkg/cfgparser/imports.go rename to framework/cfgparser/imports.go diff --git a/pkg/cfgparser/parse.go b/framework/cfgparser/parse.go similarity index 99% rename from pkg/cfgparser/parse.go rename to framework/cfgparser/parse.go index 4763e9e..d37fdba 100644 --- a/pkg/cfgparser/parse.go +++ b/framework/cfgparser/parse.go @@ -8,7 +8,7 @@ import ( "strings" "unicode" - "github.com/foxcpp/maddy/internal/config/lexer" + "github.com/foxcpp/maddy/framework/config/lexer" ) // Node struct describes a parsed configurtion block or a simple directive. diff --git a/pkg/cfgparser/parse_test.go b/framework/cfgparser/parse_test.go similarity index 100% rename from pkg/cfgparser/parse_test.go rename to framework/cfgparser/parse_test.go diff --git a/internal/config/config.go b/framework/config/config.go similarity index 83% rename from internal/config/config.go rename to framework/config/config.go index 9230593..e62fe3f 100644 --- a/internal/config/config.go +++ b/framework/config/config.go @@ -3,7 +3,7 @@ package config import ( "fmt" - parser "github.com/foxcpp/maddy/pkg/cfgparser" + parser "github.com/foxcpp/maddy/framework/cfgparser" ) type ( diff --git a/internal/config/directories.go b/framework/config/directories.go similarity index 100% rename from internal/config/directories.go rename to framework/config/directories.go diff --git a/internal/config/endpoint.go b/framework/config/endpoint.go similarity index 100% rename from internal/config/endpoint.go rename to framework/config/endpoint.go diff --git a/internal/config/endpoint_test.go b/framework/config/endpoint_test.go similarity index 100% rename from internal/config/endpoint_test.go rename to framework/config/endpoint_test.go diff --git a/internal/config/lexer/LICENSE.APACHE b/framework/config/lexer/LICENSE.APACHE similarity index 100% rename from internal/config/lexer/LICENSE.APACHE rename to framework/config/lexer/LICENSE.APACHE diff --git a/internal/config/lexer/README.md b/framework/config/lexer/README.md similarity index 100% rename from internal/config/lexer/README.md rename to framework/config/lexer/README.md diff --git a/internal/config/lexer/dispenser.go b/framework/config/lexer/dispenser.go similarity index 100% rename from internal/config/lexer/dispenser.go rename to framework/config/lexer/dispenser.go diff --git a/internal/config/lexer/dispenser_test.go b/framework/config/lexer/dispenser_test.go similarity index 100% rename from internal/config/lexer/dispenser_test.go rename to framework/config/lexer/dispenser_test.go diff --git a/internal/config/lexer/lexer.go b/framework/config/lexer/lexer.go similarity index 100% rename from internal/config/lexer/lexer.go rename to framework/config/lexer/lexer.go diff --git a/internal/config/lexer/lexer_test.go b/framework/config/lexer/lexer_test.go similarity index 100% rename from internal/config/lexer/lexer_test.go rename to framework/config/lexer/lexer_test.go diff --git a/internal/config/lexer/parse.go b/framework/config/lexer/parse.go similarity index 100% rename from internal/config/lexer/parse.go rename to framework/config/lexer/parse.go diff --git a/internal/config/map.go b/framework/config/map.go similarity index 100% rename from internal/config/map.go rename to framework/config/map.go diff --git a/internal/config/map_test.go b/framework/config/map_test.go similarity index 100% rename from internal/config/map_test.go rename to framework/config/map_test.go diff --git a/internal/check/action.go b/framework/config/module/check_action.go similarity index 93% rename from internal/check/action.go rename to framework/config/module/check_action.go index aae4a4d..b8be031 100644 --- a/internal/check/action.go +++ b/framework/config/module/check_action.go @@ -1,4 +1,4 @@ -package check +package modconfig import ( "errors" @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" ) // FailAction specifies actions that messages pipeline should take based on the @@ -20,8 +20,8 @@ import ( // Add the configuration directive to allow user to specify the action: // cfg.Custom("SOME_action", false, false, // func() (interface{}, error) { -// return check.FailAction{Quarantine: true}, nil -// }, check.FailActionDirective, &yourModule.SOMEAction) +// return modconfig.FailAction{Quarantine: true}, nil +// }, modconfig.FailActionDirective, &yourModule.SOMEAction) // return in func literal is the default value, you might want to adjust it. // // Call yourModule.SOMEAction.Apply on CheckResult containing only the diff --git a/internal/config/module/interfaces.go b/framework/config/module/interfaces.go similarity index 95% rename from internal/config/module/interfaces.go rename to framework/config/module/interfaces.go index 323ad3a..0c63d89 100644 --- a/internal/config/module/interfaces.go +++ b/framework/config/module/interfaces.go @@ -1,8 +1,8 @@ package modconfig import ( - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) func MessageCheck(globals map[string]interface{}, args []string, block config.Node) (module.Check, error) { diff --git a/internal/config/module/modconfig.go b/framework/config/module/modconfig.go similarity index 95% rename from internal/config/module/modconfig.go rename to framework/config/module/modconfig.go index 5b5cd2c..4474a65 100644 --- a/internal/config/module/modconfig.go +++ b/framework/config/module/modconfig.go @@ -14,11 +14,11 @@ import ( "reflect" "strings" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" - parser "github.com/foxcpp/maddy/pkg/cfgparser" + parser "github.com/foxcpp/maddy/framework/cfgparser" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) // createInlineModule is a helper function for config matchers that can create inline modules. diff --git a/internal/config/tls_client.go b/framework/config/tls_client.go similarity index 97% rename from internal/config/tls_client.go rename to framework/config/tls_client.go index f51478f..49daca1 100644 --- a/internal/config/tls_client.go +++ b/framework/config/tls_client.go @@ -6,7 +6,7 @@ import ( "fmt" "io/ioutil" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) func TLSClientBlock(m *Map, node Node) (interface{}, error) { diff --git a/internal/config/tls_general.go b/framework/config/tls_general.go similarity index 99% rename from internal/config/tls_general.go rename to framework/config/tls_general.go index ec129c5..fe3b6eb 100644 --- a/internal/config/tls_general.go +++ b/framework/config/tls_general.go @@ -3,7 +3,7 @@ package config import ( "crypto/tls" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) var strVersionsMap = map[string]uint16{ diff --git a/internal/config/tls_server.go b/framework/config/tls_server.go similarity index 98% rename from internal/config/tls_server.go rename to framework/config/tls_server.go index bdd2730..83c070e 100644 --- a/internal/config/tls_server.go +++ b/framework/config/tls_server.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" ) type TLSConfig struct { diff --git a/internal/dns/debugflags.go b/framework/dns/debugflags.go similarity index 100% rename from internal/dns/debugflags.go rename to framework/dns/debugflags.go diff --git a/internal/dns/dnssec.go b/framework/dns/dnssec.go similarity index 100% rename from internal/dns/dnssec.go rename to framework/dns/dnssec.go diff --git a/internal/dns/idna.go b/framework/dns/idna.go similarity index 100% rename from internal/dns/idna.go rename to framework/dns/idna.go diff --git a/internal/dns/norm.go b/framework/dns/norm.go similarity index 100% rename from internal/dns/norm.go rename to framework/dns/norm.go diff --git a/internal/dns/override.go b/framework/dns/override.go similarity index 100% rename from internal/dns/override.go rename to framework/dns/override.go diff --git a/internal/dns/resolver.go b/framework/dns/resolver.go similarity index 100% rename from internal/dns/resolver.go rename to framework/dns/resolver.go diff --git a/internal/exterrors/dns.go b/framework/exterrors/dns.go similarity index 100% rename from internal/exterrors/dns.go rename to framework/exterrors/dns.go diff --git a/internal/exterrors/exterrors.go b/framework/exterrors/exterrors.go similarity index 100% rename from internal/exterrors/exterrors.go rename to framework/exterrors/exterrors.go diff --git a/internal/exterrors/fields.go b/framework/exterrors/fields.go similarity index 100% rename from internal/exterrors/fields.go rename to framework/exterrors/fields.go diff --git a/internal/exterrors/smtp.go b/framework/exterrors/smtp.go similarity index 100% rename from internal/exterrors/smtp.go rename to framework/exterrors/smtp.go diff --git a/internal/exterrors/temporary.go b/framework/exterrors/temporary.go similarity index 100% rename from internal/exterrors/temporary.go rename to framework/exterrors/temporary.go diff --git a/internal/future/future.go b/framework/future/future.go similarity index 100% rename from internal/future/future.go rename to framework/future/future.go diff --git a/internal/future/future_test.go b/framework/future/future_test.go similarity index 100% rename from internal/future/future_test.go rename to framework/future/future_test.go diff --git a/internal/hooks/hooks.go b/framework/hooks/hooks.go similarity index 100% rename from internal/hooks/hooks.go rename to framework/hooks/hooks.go diff --git a/internal/log/log.go b/framework/log/log.go similarity index 99% rename from internal/log/log.go rename to framework/log/log.go index d15f3f2..907e4df 100644 --- a/internal/log/log.go +++ b/framework/log/log.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/exterrors" ) // Logger is the structure that writes formatted output to the underlying diff --git a/internal/log/orderedjson.go b/framework/log/orderedjson.go similarity index 100% rename from internal/log/orderedjson.go rename to framework/log/orderedjson.go diff --git a/internal/log/output.go b/framework/log/output.go similarity index 100% rename from internal/log/output.go rename to framework/log/output.go diff --git a/internal/log/syslog.go b/framework/log/syslog.go similarity index 100% rename from internal/log/syslog.go rename to framework/log/syslog.go diff --git a/internal/log/syslog_stub.go b/framework/log/syslog_stub.go similarity index 100% rename from internal/log/syslog_stub.go rename to framework/log/syslog_stub.go diff --git a/internal/log/writer.go b/framework/log/writer.go similarity index 100% rename from internal/log/writer.go rename to framework/log/writer.go diff --git a/pkg/logparser/parse.go b/framework/logparser/parse.go similarity index 100% rename from pkg/logparser/parse.go rename to framework/logparser/parse.go diff --git a/pkg/logparser/parse_test.go b/framework/logparser/parse_test.go similarity index 100% rename from pkg/logparser/parse_test.go rename to framework/logparser/parse_test.go diff --git a/internal/module/auth.go b/framework/module/auth.go similarity index 100% rename from internal/module/auth.go rename to framework/module/auth.go diff --git a/internal/module/check.go b/framework/module/check.go similarity index 98% rename from internal/module/check.go rename to framework/module/check.go index 88f772c..f1881f4 100644 --- a/internal/module/check.go +++ b/framework/module/check.go @@ -6,7 +6,7 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" ) // Check is the module interface that is meant for read-only (with the diff --git a/internal/module/delivery_target.go b/framework/module/delivery_target.go similarity index 98% rename from internal/module/delivery_target.go rename to framework/module/delivery_target.go index 6d7be48..bcec445 100644 --- a/internal/module/delivery_target.go +++ b/framework/module/delivery_target.go @@ -4,7 +4,7 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" ) // DeliveryTarget interface represents abstract storage for the message data diff --git a/internal/module/dummy.go b/framework/module/dummy.go similarity index 93% rename from internal/module/dummy.go rename to framework/module/dummy.go index f8d9c60..248b062 100644 --- a/internal/module/dummy.go +++ b/framework/module/dummy.go @@ -4,8 +4,8 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" ) // Dummy is a struct that implements PlainAuth and DeliveryTarget diff --git a/internal/module/instances.go b/framework/module/instances.go similarity index 93% rename from internal/module/instances.go rename to framework/module/instances.go index a657d5e..4c6b5fd 100644 --- a/internal/module/instances.go +++ b/framework/module/instances.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" ) var ( diff --git a/internal/module/modifier.go b/framework/module/modifier.go similarity index 98% rename from internal/module/modifier.go rename to framework/module/modifier.go index 6f2afd6..730c5e3 100644 --- a/internal/module/modifier.go +++ b/framework/module/modifier.go @@ -4,7 +4,7 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" ) // Modifier is the module interface for modules that can mutate the diff --git a/internal/module/module.go b/framework/module/module.go similarity index 98% rename from internal/module/module.go rename to framework/module/module.go index 19e5c31..74bf65f 100644 --- a/internal/module/module.go +++ b/framework/module/module.go @@ -16,7 +16,7 @@ package module import ( - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" ) // Module is the interface implemented by all maddy module instances. diff --git a/internal/module/msgmetadata.go b/framework/module/msgmetadata.go similarity index 99% rename from internal/module/msgmetadata.go rename to framework/module/msgmetadata.go index fccd3c9..9a4b532 100644 --- a/internal/module/msgmetadata.go +++ b/framework/module/msgmetadata.go @@ -6,7 +6,7 @@ import ( "io" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/future" + "github.com/foxcpp/maddy/framework/future" ) // ConnState structure holds the state information of the protocol used to diff --git a/internal/module/partial_delivery.go b/framework/module/partial_delivery.go similarity index 97% rename from internal/module/partial_delivery.go rename to framework/module/partial_delivery.go index 4a44f65..8488e61 100644 --- a/internal/module/partial_delivery.go +++ b/framework/module/partial_delivery.go @@ -4,7 +4,7 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" ) // StatusCollector is an object that is passed by message source diff --git a/internal/module/registry.go b/framework/module/registry.go similarity index 98% rename from internal/module/registry.go rename to framework/module/registry.go index 1ede212..42a90ea 100644 --- a/internal/module/registry.go +++ b/framework/module/registry.go @@ -3,7 +3,7 @@ package module import ( "sync" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) var ( diff --git a/internal/module/storage.go b/framework/module/storage.go similarity index 100% rename from internal/module/storage.go rename to framework/module/storage.go diff --git a/internal/module/table.go b/framework/module/table.go similarity index 100% rename from internal/module/table.go rename to framework/module/table.go diff --git a/internal/auth/dovecot_sasl/dovecot_sasl.go b/internal/auth/dovecot_sasl/dovecot_sasl.go index bfc9e46..cf3c77b 100644 --- a/internal/auth/dovecot_sasl/dovecot_sasl.go +++ b/internal/auth/dovecot_sasl/dovecot_sasl.go @@ -6,11 +6,11 @@ import ( "github.com/emersion/go-sasl" dovecotsasl "github.com/foxcpp/go-dovecot-sasl" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) type Auth struct { diff --git a/internal/auth/external/externalauth.go b/internal/auth/external/externalauth.go index e2c096d..2854b98 100644 --- a/internal/auth/external/externalauth.go +++ b/internal/auth/external/externalauth.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) type ExternalAuth struct { diff --git a/internal/auth/external/helperauth.go b/internal/auth/external/helperauth.go index edc55c7..88e52f8 100644 --- a/internal/auth/external/helperauth.go +++ b/internal/auth/external/helperauth.go @@ -5,7 +5,7 @@ import ( "io" "os/exec" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" ) func AuthUsingHelper(binaryPath, accountName, password string) error { diff --git a/internal/auth/pam/module.go b/internal/auth/pam/module.go index 0aa9684..e1b2906 100644 --- a/internal/auth/pam/module.go +++ b/internal/auth/pam/module.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth/external" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) type Auth struct { diff --git a/internal/auth/pass_table/table.go b/internal/auth/pass_table/table.go index db9736a..e14fde3 100644 --- a/internal/auth/pass_table/table.go +++ b/internal/auth/pass_table/table.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/module" "golang.org/x/crypto/bcrypt" "golang.org/x/text/secure/precis" ) diff --git a/internal/auth/pass_table/table_test.go b/internal/auth/pass_table/table_test.go index 465c956..38feca8 100644 --- a/internal/auth/pass_table/table_test.go +++ b/internal/auth/pass_table/table_test.go @@ -3,7 +3,7 @@ package pass_table import ( "testing" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/auth/plain_separate/plain_separate.go b/internal/auth/plain_separate/plain_separate.go index adec3c3..6ea6b5b 100644 --- a/internal/auth/plain_separate/plain_separate.go +++ b/internal/auth/plain_separate/plain_separate.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) type Auth struct { diff --git a/internal/auth/plain_separate/plain_separate_test.go b/internal/auth/plain_separate/plain_separate_test.go index b8a622d..5bed0b9 100644 --- a/internal/auth/plain_separate/plain_separate_test.go +++ b/internal/auth/plain_separate/plain_separate_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/emersion/go-sasl" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" ) type mockAuth struct { diff --git a/internal/auth/sasl.go b/internal/auth/sasl.go index 63cf2de..5616c89 100644 --- a/internal/auth/sasl.go +++ b/internal/auth/sasl.go @@ -6,10 +6,10 @@ import ( "net" "github.com/emersion/go-sasl" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) var ( diff --git a/internal/auth/sasl_test.go b/internal/auth/sasl_test.go index 10807cf..b6332dd 100644 --- a/internal/auth/sasl_test.go +++ b/internal/auth/sasl_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/auth/shadow/module.go b/internal/auth/shadow/module.go index ec0d179..58a63e8 100644 --- a/internal/auth/shadow/module.go +++ b/internal/auth/shadow/module.go @@ -8,10 +8,10 @@ import ( "os" "path/filepath" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth/external" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) type Auth struct { diff --git a/internal/check/command/command.go b/internal/check/command/command.go index 45a98a2..9ee4ba8 100644 --- a/internal/check/command/command.go +++ b/internal/check/command/command.go @@ -16,12 +16,12 @@ import ( "strings" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) @@ -43,7 +43,7 @@ type Check struct { log log.Logger stage Stage - actions map[int]check.FailAction + actions map[int]modconfig.FailAction cmd string cmdArgs []string } @@ -51,11 +51,11 @@ type Check struct { func New(modName, instName string, aliases, inlineArgs []string) (module.Module, error) { c := &Check{ instName: instName, - actions: map[int]check.FailAction{ - 1: check.FailAction{ + actions: map[int]modconfig.FailAction{ + 1: modconfig.FailAction{ Reject: true, }, - 2: check.FailAction{ + 2: modconfig.FailAction{ Quarantine: true, }, }, @@ -105,7 +105,7 @@ func (c *Check) Init(cfg *config.Map) error { if err != nil { return config.NodeErr(node, "%v", err) } - action, err := check.ParseActionDirective(node.Args[1:]) + action, err := modconfig.ParseActionDirective(node.Args[1:]) if err != nil { return config.NodeErr(node, "%v", err) } diff --git a/internal/check/dkim/dkim.go b/internal/check/dkim/dkim.go index a10438a..e4ea6fa 100644 --- a/internal/check/dkim/dkim.go +++ b/internal/check/dkim/dkim.go @@ -12,13 +12,13 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" "github.com/emersion/go-msgauth/dkim" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) @@ -28,8 +28,8 @@ type Check struct { requiredFields map[string]struct{} allowBodySubset bool - brokenSigAction check.FailAction - noSigAction check.FailAction + brokenSigAction modconfig.FailAction + noSigAction modconfig.FailAction failOpen bool resolver dns.Resolver @@ -55,12 +55,12 @@ func (c *Check) Init(cfg *config.Map) error { cfg.Bool("fail_open", false, false, &c.failOpen) cfg.Custom("broken_sig_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.brokenSigAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.brokenSigAction) cfg.Custom("no_sig_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.noSigAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.noSigAction) _, err := cfg.Process() if err != nil { return err diff --git a/internal/check/dkim/dkim_test.go b/internal/check/dkim/dkim_test.go index 0a8d44b..ec98982 100644 --- a/internal/check/dkim/dkim_test.go +++ b/internal/check/dkim/dkim_test.go @@ -8,10 +8,10 @@ import ( "github.com/emersion/go-msgauth/authres" "github.com/foxcpp/go-mockdns" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/check/dns/dns.go b/internal/check/dns/dns.go index aaeca87..1a628ea 100644 --- a/internal/check/dns/dns.go +++ b/internal/check/dns/dns.go @@ -4,11 +4,12 @@ import ( "net" "strings" - "github.com/foxcpp/maddy/internal/address" + "github.com/foxcpp/maddy/framework/address" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" ) func requireMatchingRDNS(ctx check.StatelessCheckContext) module.CheckResult { @@ -217,10 +218,10 @@ func requireMatchingEHLO(ctx check.StatelessCheckContext) module.CheckResult { } func init() { - check.RegisterStatelessCheck("require_matching_rdns", check.FailAction{Quarantine: true}, + check.RegisterStatelessCheck("require_matching_rdns", modconfig.FailAction{Quarantine: true}, requireMatchingRDNS, nil, nil, nil) - check.RegisterStatelessCheck("require_mx_record", check.FailAction{Quarantine: true}, + check.RegisterStatelessCheck("require_mx_record", modconfig.FailAction{Quarantine: true}, nil, requireMXRecord, nil, nil) - check.RegisterStatelessCheck("require_matching_ehlo", check.FailAction{Quarantine: true}, + check.RegisterStatelessCheck("require_matching_ehlo", modconfig.FailAction{Quarantine: true}, requireMatchingEHLO, nil, nil, nil) } diff --git a/internal/check/dns/dns_test.go b/internal/check/dns/dns_test.go index 8d10232..76e6f1c 100644 --- a/internal/check/dns/dns_test.go +++ b/internal/check/dns/dns_test.go @@ -6,9 +6,9 @@ import ( "github.com/emersion/go-smtp" "github.com/foxcpp/go-mockdns" + "github.com/foxcpp/maddy/framework/future" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/future" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/check/dnsbl/common.go b/internal/check/dnsbl/common.go index 5800458..09b9c30 100644 --- a/internal/check/dnsbl/common.go +++ b/internal/check/dnsbl/common.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" ) type ListedErr struct { diff --git a/internal/check/dnsbl/dnsbl.go b/internal/check/dnsbl/dnsbl.go index 3bfc8bb..9f260ea 100644 --- a/internal/check/dnsbl/dnsbl.go +++ b/internal/check/dnsbl/dnsbl.go @@ -10,13 +10,13 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" "golang.org/x/sync/errgroup" ) diff --git a/internal/check/milter/milter.go b/internal/check/milter/milter.go index 342e308..533678c 100644 --- a/internal/check/milter/milter.go +++ b/internal/check/milter/milter.go @@ -10,11 +10,11 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-milter" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) diff --git a/internal/check/requiretls/requiretls.go b/internal/check/requiretls/requiretls.go index 26cc266..1f27e16 100644 --- a/internal/check/requiretls/requiretls.go +++ b/internal/check/requiretls/requiretls.go @@ -1,9 +1,10 @@ package requiretls import ( + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" ) func requireTLS(ctx check.StatelessCheckContext) module.CheckResult { @@ -22,5 +23,5 @@ func requireTLS(ctx check.StatelessCheckContext) module.CheckResult { } func init() { - check.RegisterStatelessCheck("require_tls", check.FailAction{Reject: true}, requireTLS, nil, nil, nil) + check.RegisterStatelessCheck("require_tls", modconfig.FailAction{Reject: true}, requireTLS, nil, nil, nil) } diff --git a/internal/check/rspamd/rspamd.go b/internal/check/rspamd/rspamd.go index 9ba7101..1e53fa6 100644 --- a/internal/check/rspamd/rspamd.go +++ b/internal/check/rspamd/rspamd.go @@ -11,12 +11,12 @@ import ( "strings" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) @@ -32,10 +32,10 @@ type Check struct { tag string mtaName string - ioErrAction check.FailAction - errorRespAction check.FailAction - addHdrAction check.FailAction - rewriteSubjAction check.FailAction + ioErrAction modconfig.FailAction + errorRespAction modconfig.FailAction + addHdrAction modconfig.FailAction + rewriteSubjAction modconfig.FailAction client *http.Client } @@ -81,20 +81,20 @@ func (c *Check) Init(cfg *config.Map) error { cfg.String("hostname", true, false, "", &c.mtaName) cfg.Custom("io_error_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.ioErrAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.ioErrAction) cfg.Custom("error_resp_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.errorRespAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.errorRespAction) cfg.Custom("add_header_action", false, false, func() (interface{}, error) { - return check.FailAction{Quarantine: true}, nil - }, check.FailActionDirective, &c.addHdrAction) + return modconfig.FailAction{Quarantine: true}, nil + }, modconfig.FailActionDirective, &c.addHdrAction) cfg.Custom("rewrite_subj_action", false, false, func() (interface{}, error) { - return check.FailAction{Quarantine: true}, nil - }, check.FailActionDirective, &c.rewriteSubjAction) + return modconfig.FailAction{Quarantine: true}, nil + }, modconfig.FailActionDirective, &c.rewriteSubjAction) cfg.StringList("flags", false, false, []string{"pass_all"}, &flags) if _, err := cfg.Process(); err != nil { return err diff --git a/internal/check/skeleton.go b/internal/check/skeleton.go index 6a02418..08e4ff2 100644 --- a/internal/check/skeleton.go +++ b/internal/check/skeleton.go @@ -9,10 +9,10 @@ package directory_name_here import ( "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) diff --git a/internal/check/spf/spf.go b/internal/check/spf/spf.go index 9453c30..46079fc 100644 --- a/internal/check/spf/spf.go +++ b/internal/check/spf/spf.go @@ -12,15 +12,15 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" "github.com/emersion/go-msgauth/dmarc" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/check" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" maddydmarc "github.com/foxcpp/maddy/internal/dmarc" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/target" "golang.org/x/net/idna" ) @@ -31,12 +31,12 @@ type Check struct { instName string enforceEarly bool - noneAction check.FailAction - neutralAction check.FailAction - failAction check.FailAction - softfailAction check.FailAction - permerrAction check.FailAction - temperrAction check.FailAction + noneAction modconfig.FailAction + neutralAction modconfig.FailAction + failAction modconfig.FailAction + softfailAction modconfig.FailAction + permerrAction modconfig.FailAction + temperrAction modconfig.FailAction log log.Logger } @@ -61,28 +61,28 @@ func (c *Check) Init(cfg *config.Map) error { cfg.Bool("enforce_early", true, false, &c.enforceEarly) cfg.Custom("none_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.noneAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.noneAction) cfg.Custom("neutral_action", false, false, func() (interface{}, error) { - return check.FailAction{}, nil - }, check.FailActionDirective, &c.neutralAction) + return modconfig.FailAction{}, nil + }, modconfig.FailActionDirective, &c.neutralAction) cfg.Custom("fail_action", false, false, func() (interface{}, error) { - return check.FailAction{Quarantine: true}, nil - }, check.FailActionDirective, &c.failAction) + return modconfig.FailAction{Quarantine: true}, nil + }, modconfig.FailActionDirective, &c.failAction) cfg.Custom("softfail_action", false, false, func() (interface{}, error) { - return check.FailAction{Quarantine: true}, nil - }, check.FailActionDirective, &c.softfailAction) + return modconfig.FailAction{Quarantine: true}, nil + }, modconfig.FailActionDirective, &c.softfailAction) cfg.Custom("permerr_action", false, false, func() (interface{}, error) { - return check.FailAction{Reject: true}, nil - }, check.FailActionDirective, &c.permerrAction) + return modconfig.FailAction{Reject: true}, nil + }, modconfig.FailActionDirective, &c.permerrAction) cfg.Custom("temperr_action", false, false, func() (interface{}, error) { - return check.FailAction{Reject: true}, nil - }, check.FailActionDirective, &c.temperrAction) + return modconfig.FailAction{Reject: true}, nil + }, modconfig.FailActionDirective, &c.temperrAction) _, err := cfg.Process() if err != nil { return err diff --git a/internal/check/stateless_check.go b/internal/check/stateless_check.go index 012c504..2084de0 100644 --- a/internal/check/stateless_check.go +++ b/internal/check/stateless_check.go @@ -6,11 +6,12 @@ import ( "runtime/trace" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) @@ -43,9 +44,9 @@ type statelessCheck struct { logger log.Logger // One used by Init if config option is not passed by a user. - defaultFailAction FailAction + defaultFailAction modconfig.FailAction // The actual fail action that should be applied. - failAction FailAction + failAction modconfig.FailAction connCheck FuncConnCheck senderCheck FuncSenderCheck @@ -138,7 +139,7 @@ func (c *statelessCheck) Init(cfg *config.Map) error { cfg.Custom("fail_action", false, false, func() (interface{}, error) { return c.defaultFailAction, nil - }, FailActionDirective, &c.failAction) + }, modconfig.FailActionDirective, &c.failAction) _, err := cfg.Process() return err } @@ -161,7 +162,7 @@ func (c *statelessCheck) InstanceName() string { // StatelessCheck supports different action types based on the user configuration, but the particular check // code doesn't need to know about it. It should assume that it is always "Reject" and hence it should // populate Reason field of the result object with the relevant error description. -func RegisterStatelessCheck(name string, defaultFailAction FailAction, connCheck FuncConnCheck, senderCheck FuncSenderCheck, rcptCheck FuncRcptCheck, bodyCheck FuncBodyCheck) { +func RegisterStatelessCheck(name string, defaultFailAction modconfig.FailAction, connCheck FuncConnCheck, senderCheck FuncSenderCheck, rcptCheck FuncRcptCheck, bodyCheck FuncBodyCheck) { module.Register(name, func(modName, instName string, aliases, inlineArgs []string) (module.Module, error) { if len(inlineArgs) != 0 { return nil, fmt.Errorf("%s: inline arguments are not used", modName) diff --git a/internal/dmarc/evaluate.go b/internal/dmarc/evaluate.go index 57a0e8f..9065bb5 100644 --- a/internal/dmarc/evaluate.go +++ b/internal/dmarc/evaluate.go @@ -11,7 +11,7 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" "github.com/emersion/go-msgauth/dmarc" - "github.com/foxcpp/maddy/internal/address" + "github.com/foxcpp/maddy/framework/address" "golang.org/x/net/publicsuffix" ) diff --git a/internal/dsn/dsn.go b/internal/dsn/dsn.go index b4fc9db..40df4a5 100644 --- a/internal/dsn/dsn.go +++ b/internal/dsn/dsn.go @@ -12,8 +12,8 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/dns" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/dns" ) type ReportingMTAInfo struct { diff --git a/internal/endpoint/dovecot_sasld/dovecot_sasl.go b/internal/endpoint/dovecot_sasld/dovecot_sasl.go index 5222ceb..e23280e 100644 --- a/internal/endpoint/dovecot_sasld/dovecot_sasl.go +++ b/internal/endpoint/dovecot_sasld/dovecot_sasl.go @@ -9,10 +9,10 @@ import ( "github.com/emersion/go-sasl" dovecotsasl "github.com/foxcpp/go-dovecot-sasl" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) const modName = "dovecot_sasld" diff --git a/internal/endpoint/imap/imap.go b/internal/endpoint/imap/imap.go index 353bd44..81bd159 100644 --- a/internal/endpoint/imap/imap.go +++ b/internal/endpoint/imap/imap.go @@ -22,11 +22,11 @@ import ( "github.com/emersion/go-sasl" i18nlevel "github.com/foxcpp/go-imap-i18nlevel" "github.com/foxcpp/go-imap-sql/children" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/updatepipe" ) diff --git a/internal/endpoint/smtp/session.go b/internal/endpoint/smtp/session.go index bd11ab9..2d8f204 100644 --- a/internal/endpoint/smtp/session.go +++ b/internal/endpoint/smtp/session.go @@ -14,12 +14,12 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) type Session struct { diff --git a/internal/endpoint/smtp/smtp.go b/internal/endpoint/smtp/smtp.go index 3c22f66..46ed4c3 100644 --- a/internal/endpoint/smtp/smtp.go +++ b/internal/endpoint/smtp/smtp.go @@ -16,16 +16,16 @@ import ( "github.com/emersion/go-sasl" "github.com/emersion/go-smtp" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/future" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/future" "github.com/foxcpp/maddy/internal/limits" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/msgpipeline" "golang.org/x/net/idna" ) diff --git a/internal/endpoint/smtp/smtp_test.go b/internal/endpoint/smtp/smtp_test.go index 889abb6..46c81d0 100644 --- a/internal/endpoint/smtp/smtp_test.go +++ b/internal/endpoint/smtp/smtp_test.go @@ -13,10 +13,10 @@ import ( "github.com/emersion/go-sasl" "github.com/emersion/go-smtp" "github.com/foxcpp/go-mockdns" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/auth" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/msgpipeline" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/endpoint/smtp/smtputf8_test.go b/internal/endpoint/smtp/smtputf8_test.go index 7200425..e30eb47 100644 --- a/internal/endpoint/smtp/smtputf8_test.go +++ b/internal/endpoint/smtp/smtputf8_test.go @@ -6,8 +6,8 @@ import ( "github.com/emersion/go-smtp" "github.com/foxcpp/go-mockdns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/endpoint/smtp/submission.go b/internal/endpoint/smtp/submission.go index a3b579c..b9b29f4 100644 --- a/internal/endpoint/smtp/submission.go +++ b/internal/endpoint/smtp/submission.go @@ -7,8 +7,8 @@ import ( "time" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/google/uuid" ) diff --git a/internal/endpoint/smtp/submission_test.go b/internal/endpoint/smtp/submission_test.go index 40aa1d3..58ee9c6 100644 --- a/internal/endpoint/smtp/submission_test.go +++ b/internal/endpoint/smtp/submission_test.go @@ -7,7 +7,7 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" ) func init() { diff --git a/internal/limits/limits.go b/internal/limits/limits.go index b5a5a90..5ef9924 100644 --- a/internal/limits/limits.go +++ b/internal/limits/limits.go @@ -14,9 +14,9 @@ import ( "strconv" "time" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/limits/limiters" - "github.com/foxcpp/maddy/internal/module" ) type Group struct { diff --git a/internal/modify/dkim/dkim.go b/internal/modify/dkim/dkim.go index be9f7e6..f00bbc9 100644 --- a/internal/modify/dkim/dkim.go +++ b/internal/modify/dkim/dkim.go @@ -13,13 +13,13 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/dkim" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" "golang.org/x/net/idna" ) diff --git a/internal/modify/dkim/dkim_test.go b/internal/modify/dkim/dkim_test.go index c64d0e4..dbd8333 100644 --- a/internal/modify/dkim/dkim_test.go +++ b/internal/modify/dkim/dkim_test.go @@ -13,9 +13,9 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/dkim" "github.com/foxcpp/go-mockdns" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/modify/group.go b/internal/modify/group.go index 70dbeea..ee29295 100644 --- a/internal/modify/group.go +++ b/internal/modify/group.go @@ -4,10 +4,10 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/module" ) type ( diff --git a/internal/modify/replace_addr.go b/internal/modify/replace_addr.go index cb857e7..53cc035 100644 --- a/internal/modify/replace_addr.go +++ b/internal/modify/replace_addr.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/module" ) // replaceAddr is a simple module that replaces matching sender (or recipient) address diff --git a/internal/modify/replace_addr_test.go b/internal/modify/replace_addr_test.go index e56e26f..38d80c6 100644 --- a/internal/modify/replace_addr_test.go +++ b/internal/modify/replace_addr_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/bench_test.go b/internal/msgpipeline/bench_test.go index 24fbb88..988c4e4 100644 --- a/internal/msgpipeline/bench_test.go +++ b/internal/msgpipeline/bench_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/bodynonatomic_test.go b/internal/msgpipeline/bodynonatomic_test.go index cd71888..5e1ccfc 100644 --- a/internal/msgpipeline/bodynonatomic_test.go +++ b/internal/msgpipeline/bodynonatomic_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/modify" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/check_group.go b/internal/msgpipeline/check_group.go index 2f7bb11..79e1084 100644 --- a/internal/msgpipeline/check_group.go +++ b/internal/msgpipeline/check_group.go @@ -1,9 +1,9 @@ package msgpipeline import ( - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/module" ) // CheckGroup is a module container for a group of Check implementations. diff --git a/internal/msgpipeline/check_runner.go b/internal/msgpipeline/check_runner.go index f01029f..046dfd3 100644 --- a/internal/msgpipeline/check_runner.go +++ b/internal/msgpipeline/check_runner.go @@ -6,12 +6,12 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/dmarc" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" ) // checkRunner runs groups of checks, collects and merges results. diff --git a/internal/msgpipeline/check_test.go b/internal/msgpipeline/check_test.go index e29706f..616dccf 100644 --- a/internal/msgpipeline/check_test.go +++ b/internal/msgpipeline/check_test.go @@ -6,7 +6,7 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/config.go b/internal/msgpipeline/config.go index fbbe7e2..9a29de1 100644 --- a/internal/msgpipeline/config.go +++ b/internal/msgpipeline/config.go @@ -5,13 +5,13 @@ import ( "strconv" "strings" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/modify" - "github.com/foxcpp/maddy/internal/module" ) type sourceIn struct { diff --git a/internal/msgpipeline/config_test.go b/internal/msgpipeline/config_test.go index 30d668d..2e433f5 100644 --- a/internal/msgpipeline/config_test.go +++ b/internal/msgpipeline/config_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/foxcpp/maddy/internal/exterrors" - parser "github.com/foxcpp/maddy/pkg/cfgparser" + parser "github.com/foxcpp/maddy/framework/cfgparser" + "github.com/foxcpp/maddy/framework/exterrors" ) func policyError(code int) error { diff --git a/internal/msgpipeline/dmarc_test.go b/internal/msgpipeline/dmarc_test.go index 694c1d3..c2de575 100644 --- a/internal/msgpipeline/dmarc_test.go +++ b/internal/msgpipeline/dmarc_test.go @@ -13,9 +13,9 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-msgauth/authres" "github.com/foxcpp/go-mockdns" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/modifier_test.go b/internal/msgpipeline/modifier_test.go index 439b661..0aa5a4e 100644 --- a/internal/msgpipeline/modifier_test.go +++ b/internal/msgpipeline/modifier_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/modify" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/module.go b/internal/msgpipeline/module.go index b93c933..d2798be 100644 --- a/internal/msgpipeline/module.go +++ b/internal/msgpipeline/module.go @@ -1,9 +1,9 @@ package msgpipeline import ( - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) type Module struct { diff --git a/internal/msgpipeline/msgpipeline.go b/internal/msgpipeline/msgpipeline.go index 0b7e0ae..96d39ed 100644 --- a/internal/msgpipeline/msgpipeline.go +++ b/internal/msgpipeline/msgpipeline.go @@ -5,14 +5,14 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/modify" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/target" "golang.org/x/sync/errgroup" ) diff --git a/internal/msgpipeline/msgpipeline_test.go b/internal/msgpipeline/msgpipeline_test.go index d0bd4b9..f26c6f7 100644 --- a/internal/msgpipeline/msgpipeline_test.go +++ b/internal/msgpipeline/msgpipeline_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/msgpipeline/objname.go b/internal/msgpipeline/objname.go index 8c35e90..62d332d 100644 --- a/internal/msgpipeline/objname.go +++ b/internal/msgpipeline/objname.go @@ -3,7 +3,7 @@ package msgpipeline import ( "fmt" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" ) // objectName returns a new that is usable to identify the used external diff --git a/internal/msgpipeline/regress_test.go b/internal/msgpipeline/regress_test.go index ff6f290..5bc35ff 100644 --- a/internal/msgpipeline/regress_test.go +++ b/internal/msgpipeline/regress_test.go @@ -3,7 +3,7 @@ package msgpipeline import ( "testing" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/smtpconn/smtpconn.go b/internal/smtpconn/smtpconn.go index f22a4f9..be6764e 100644 --- a/internal/smtpconn/smtpconn.go +++ b/internal/smtpconn/smtpconn.go @@ -19,10 +19,10 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" ) // The C object represents the SMTP connection and is a wrapper around diff --git a/internal/smtpconn/smtputf8_test.go b/internal/smtpconn/smtputf8_test.go index 7ef69b9..2a33431 100644 --- a/internal/smtpconn/smtputf8_test.go +++ b/internal/smtpconn/smtputf8_test.go @@ -7,8 +7,8 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/storage/imapsql/imapsql.go b/internal/storage/imapsql/imapsql.go index d49d7a6..50c1c0b 100644 --- a/internal/storage/imapsql/imapsql.go +++ b/internal/storage/imapsql/imapsql.go @@ -23,13 +23,13 @@ import ( "github.com/emersion/go-imap/backend" "github.com/emersion/go-message/textproto" imapsql "github.com/foxcpp/go-imap-sql" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" "github.com/foxcpp/maddy/internal/updatepipe" "golang.org/x/text/secure/precis" diff --git a/internal/table/file.go b/internal/table/file.go index 29ed0ff..966917d 100644 --- a/internal/table/file.go +++ b/internal/table/file.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) const FileModName = "table.file" diff --git a/internal/table/file_test.go b/internal/table/file_test.go index b5a1ce0..bea8229 100644 --- a/internal/table/file_test.go +++ b/internal/table/file_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/table/identity.go b/internal/table/identity.go index 3f79766..a6fbec1 100644 --- a/internal/table/identity.go +++ b/internal/table/identity.go @@ -1,8 +1,8 @@ package table import ( - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) type Identity struct { diff --git a/internal/table/regexp.go b/internal/table/regexp.go index 5a600bb..3fc4c66 100644 --- a/internal/table/regexp.go +++ b/internal/table/regexp.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) type Regexp struct { diff --git a/internal/table/sql_query.go b/internal/table/sql_query.go index a29bfd6..faf3ec4 100644 --- a/internal/table/sql_query.go +++ b/internal/table/sql_query.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" _ "github.com/lib/pq" ) diff --git a/internal/table/sql_query_test.go b/internal/table/sql_query_test.go index d543693..1060952 100644 --- a/internal/table/sql_query_test.go +++ b/internal/table/sql_query_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/table/sql_table.go b/internal/table/sql_table.go index 1e7d035..b551d5e 100644 --- a/internal/table/sql_table.go +++ b/internal/table/sql_table.go @@ -3,8 +3,8 @@ package table import ( "fmt" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" _ "github.com/lib/pq" ) diff --git a/internal/table/static.go b/internal/table/static.go index a329883..ac8f655 100644 --- a/internal/table/static.go +++ b/internal/table/static.go @@ -1,8 +1,8 @@ package table import ( - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) type Static struct { diff --git a/internal/target/delivery.go b/internal/target/delivery.go index ef9fa64..0bbe1c3 100644 --- a/internal/target/delivery.go +++ b/internal/target/delivery.go @@ -1,8 +1,8 @@ package target import ( - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" ) func DeliveryLogger(l log.Logger, msgMeta *module.MsgMetadata) log.Logger { diff --git a/internal/target/queue/queue.go b/internal/target/queue/queue.go index 4ca8126..63b6d1b 100644 --- a/internal/target/queue/queue.go +++ b/internal/target/queue/queue.go @@ -58,13 +58,13 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/dsn" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/msgpipeline" "github.com/foxcpp/maddy/internal/target" ) diff --git a/internal/target/queue/queue_test.go b/internal/target/queue/queue_test.go index 4c2ff11..01efaac 100644 --- a/internal/target/queue/queue_test.go +++ b/internal/target/queue/queue_test.go @@ -15,10 +15,10 @@ import ( "time" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/target/received.go b/internal/target/received.go index e12b22c..fcac601 100644 --- a/internal/target/received.go +++ b/internal/target/received.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/module" ) func SanitizeForHeader(raw string) string { diff --git a/internal/target/remote/connect.go b/internal/target/remote/connect.go index 885387c..5e198a1 100644 --- a/internal/target/remote/connect.go +++ b/internal/target/remote/connect.go @@ -8,8 +8,8 @@ import ( "runtime/trace" "sort" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" "github.com/foxcpp/maddy/internal/smtpconn" ) diff --git a/internal/target/remote/dane.go b/internal/target/remote/dane.go index 7bbaf0e..afb5d35 100644 --- a/internal/target/remote/dane.go +++ b/internal/target/remote/dane.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "crypto/x509" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" ) // verifyDANE checks whether TLSA records require TLS use and match the diff --git a/internal/target/remote/dane_test.go b/internal/target/remote/dane_test.go index 338c7d1..0f50f58 100644 --- a/internal/target/remote/dane_test.go +++ b/internal/target/remote/dane_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/foxcpp/go-mockdns" - "github.com/foxcpp/maddy/internal/dns" + "github.com/foxcpp/maddy/framework/dns" "github.com/foxcpp/maddy/internal/testutils" miekgdns "github.com/miekg/dns" ) diff --git a/internal/target/remote/mxauth_test.go b/internal/target/remote/mxauth_test.go index 656adfd..ffc6450 100644 --- a/internal/target/remote/mxauth_test.go +++ b/internal/target/remote/mxauth_test.go @@ -14,8 +14,8 @@ import ( "github.com/foxcpp/go-mockdns" "github.com/foxcpp/go-mtasts" "github.com/foxcpp/go-mtasts/preload" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/target/remote/policy_group.go b/internal/target/remote/policy_group.go index a9bcccc..90d2f3a 100644 --- a/internal/target/remote/policy_group.go +++ b/internal/target/remote/policy_group.go @@ -1,8 +1,8 @@ package remote import ( - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) // PolicyGroup is a module container for a group of Policy implementations. diff --git a/internal/target/remote/remote.go b/internal/target/remote/remote.go index 2adf61f..0ec581c 100644 --- a/internal/target/remote/remote.go +++ b/internal/target/remote/remote.go @@ -16,15 +16,15 @@ import ( "sync" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/address" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - modconfig "github.com/foxcpp/maddy/internal/config/module" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/address" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + modconfig "github.com/foxcpp/maddy/framework/config/module" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/limits" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/smtpconn/pool" "github.com/foxcpp/maddy/internal/target" "golang.org/x/net/idna" diff --git a/internal/target/remote/remote_test.go b/internal/target/remote/remote_test.go index d7b5562..d6fc17a 100644 --- a/internal/target/remote/remote_test.go +++ b/internal/target/remote/remote_test.go @@ -16,12 +16,12 @@ import ( "github.com/emersion/go-smtp" "github.com/foxcpp/go-mockdns" "github.com/foxcpp/go-mtasts" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/limits" - "github.com/foxcpp/maddy/internal/module" "github.com/foxcpp/maddy/internal/smtpconn/pool" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/target/remote/security.go b/internal/target/remote/security.go index 2868414..f643f30 100644 --- a/internal/target/remote/security.go +++ b/internal/target/remote/security.go @@ -14,12 +14,12 @@ import ( "github.com/foxcpp/go-mtasts" "github.com/foxcpp/go-mtasts/preload" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/dns" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/future" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/dns" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/future" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/target" ) diff --git a/internal/target/smtp/sasl.go b/internal/target/smtp/sasl.go index acb273d..7f711f7 100644 --- a/internal/target/smtp/sasl.go +++ b/internal/target/smtp/sasl.go @@ -2,9 +2,9 @@ package smtp_downstream import ( "github.com/emersion/go-sasl" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" ) type saslClientFactory = func(msgMeta *module.MsgMetadata) (sasl.Client, error) diff --git a/internal/target/smtp/sasl_test.go b/internal/target/smtp/sasl_test.go index 93ea9f1..0557338 100644 --- a/internal/target/smtp/sasl_test.go +++ b/internal/target/smtp/sasl_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/target/smtp/smtp_downstream.go b/internal/target/smtp/smtp_downstream.go index b291069..ee72d77 100644 --- a/internal/target/smtp/smtp_downstream.go +++ b/internal/target/smtp/smtp_downstream.go @@ -18,11 +18,11 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/foxcpp/maddy/internal/smtpconn" "github.com/foxcpp/maddy/internal/target" "golang.org/x/net/idna" diff --git a/internal/target/smtp/smtp_downstream_test.go b/internal/target/smtp/smtp_downstream_test.go index d8726cc..3b5e81f 100644 --- a/internal/target/smtp/smtp_downstream_test.go +++ b/internal/target/smtp/smtp_downstream_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/target/smtp/smtputf8_test.go b/internal/target/smtp/smtputf8_test.go index a31c40f..47bd4bb 100644 --- a/internal/target/smtp/smtputf8_test.go +++ b/internal/target/smtp/smtputf8_test.go @@ -3,7 +3,7 @@ package smtp_downstream import ( "testing" - "github.com/foxcpp/maddy/internal/config" + "github.com/foxcpp/maddy/framework/config" "github.com/foxcpp/maddy/internal/testutils" ) diff --git a/internal/testutils/bench_delivery.go b/internal/testutils/bench_delivery.go index 61ec67f..2258bb5 100644 --- a/internal/testutils/bench_delivery.go +++ b/internal/testutils/bench_delivery.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/module" ) // Empirically observed "around average" values. diff --git a/internal/testutils/buffer.go b/internal/testutils/buffer.go index 596ec2e..8b0a72a 100644 --- a/internal/testutils/buffer.go +++ b/internal/testutils/buffer.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" + "github.com/foxcpp/maddy/framework/buffer" ) func BodyFromStr(t *testing.T, literal string) (textproto.Header, buffer.MemoryBuffer) { diff --git a/internal/testutils/check.go b/internal/testutils/check.go index 350c0f4..63881a4 100644 --- a/internal/testutils/check.go +++ b/internal/testutils/check.go @@ -5,9 +5,9 @@ import ( "github.com/emersion/go-message/textproto" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) type Check struct { diff --git a/internal/testutils/logger.go b/internal/testutils/logger.go index 326e0f9..6463f3d 100644 --- a/internal/testutils/logger.go +++ b/internal/testutils/logger.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) var ( diff --git a/internal/testutils/modifier.go b/internal/testutils/modifier.go index 91c6aa3..9853275 100644 --- a/internal/testutils/modifier.go +++ b/internal/testutils/modifier.go @@ -4,9 +4,9 @@ import ( "context" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/module" ) type Modifier struct { diff --git a/internal/testutils/smtp_server.go b/internal/testutils/smtp_server.go index ddec5e9..efb4d91 100644 --- a/internal/testutils/smtp_server.go +++ b/internal/testutils/smtp_server.go @@ -12,7 +12,7 @@ import ( "time" "github.com/emersion/go-smtp" - "github.com/foxcpp/maddy/internal/exterrors" + "github.com/foxcpp/maddy/framework/exterrors" ) type SMTPMessage struct { diff --git a/internal/testutils/target.go b/internal/testutils/target.go index 1eb8c6c..eb1a0cb 100644 --- a/internal/testutils/target.go +++ b/internal/testutils/target.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/emersion/go-message/textproto" - "github.com/foxcpp/maddy/internal/buffer" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/exterrors" - "github.com/foxcpp/maddy/internal/module" + "github.com/foxcpp/maddy/framework/buffer" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/exterrors" + "github.com/foxcpp/maddy/framework/module" ) type Msg struct { diff --git a/internal/updatepipe/unix_pipe.go b/internal/updatepipe/unix_pipe.go index b30429f..7b7c447 100644 --- a/internal/updatepipe/unix_pipe.go +++ b/internal/updatepipe/unix_pipe.go @@ -8,7 +8,7 @@ import ( "os" "github.com/emersion/go-imap/backend" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) // UnixSockPipe implements the UpdatePipe interface by serializating updates diff --git a/maddy.go b/maddy.go index a524ef2..9c06968 100644 --- a/maddy.go +++ b/maddy.go @@ -13,11 +13,11 @@ import ( "runtime/debug" "strings" - "github.com/foxcpp/maddy/internal/config" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" - "github.com/foxcpp/maddy/internal/module" - parser "github.com/foxcpp/maddy/pkg/cfgparser" + parser "github.com/foxcpp/maddy/framework/cfgparser" + "github.com/foxcpp/maddy/framework/config" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" + "github.com/foxcpp/maddy/framework/module" "github.com/prometheus/client_golang/prometheus/promhttp" // Import packages for side-effect of module registration. diff --git a/pkg/README.md b/pkg/README.md deleted file mode 100644 index a6c8895..0000000 --- a/pkg/README.md +++ /dev/null @@ -1,10 +0,0 @@ -maddy integration libraries ----------------------------- - -This directory contains Go packages with stable API that can be used to -interact with maddy, e.g. inspect some of its structures. - -Currently there is a configuration file parser and a structured log parser. - -API stability is defined by the maddy version following the semantic versioning -rules. diff --git a/signal.go b/signal.go index 5fdb1f1..fcd2234 100644 --- a/signal.go +++ b/signal.go @@ -7,8 +7,8 @@ import ( "os/signal" "syscall" - "github.com/foxcpp/maddy/internal/hooks" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/hooks" + "github.com/foxcpp/maddy/framework/log" ) // handleSignals function creates and listens on OS signals channel. diff --git a/signal_nonposix.go b/signal_nonposix.go index 4df33f9..95fb4a1 100644 --- a/signal_nonposix.go +++ b/signal_nonposix.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) func handleSignals() os.Signal { diff --git a/systemd.go b/systemd.go index 1ffb6f4..68a97aa 100644 --- a/systemd.go +++ b/systemd.go @@ -11,7 +11,7 @@ import ( "strings" "syscall" - "github.com/foxcpp/maddy/internal/log" + "github.com/foxcpp/maddy/framework/log" ) type SDStatus string