move files and update import paths
69 files changed, 108 insertions(+), 108 deletions(-)
changed files
- .ko.yaml
- cmd/barkeep/main.go
- cmd/build/main.go
- domain/indieweb/atom/atom.go
- shared/buffer/buffer.go
- shared/buffer/buffer_test.go
- domain/content/builder/builder.go
- domain/content/builder/template/hasher.go
- domain/content/builder/template/template.go
- shared/cache/cache.go
- domain/calendar/calendar.go
- shared/config/config.go
- domain/content/posts.go
- shared/env/env.go
- shared/events/file.go
- shared/events/redis.go
- shared/events/update.go
- domain/content/fetcher/fetcher.go
- shared/file/file.go
- domain/web/middleware/error.go
- domain/web/middleware/mux.go
- domain/web/middleware/redirect.go
- domain/content/markdown/markdown.go
- shared/buffer/writecloser.go
- shared/file/compress.go
- shared/file/multifile.go
- domain/content/publisher/app.go
- domain/content/publisher/mux.go
- domain/content/publisher/templates/index.go
- domain/content/publisher/templates/layout.go
- domain/web/server/app.go
- domain/web/server/logging.go
- domain/web/server/server.go
- domain/web/server/tcp.go
- domain/indieweb/sitemap/sitemap.go
- domain/analytics/counter.go
- domain/analytics/goatcounter/count.go
- domain/analytics/nullcounter/nullcounter.go
- shared/storage/file.go
- shared/storage/files/file.go
- shared/storage/files/reader.go
- shared/storage/files/writer.go
- shared/storage/interface.go
- shared/storage/mime.go
- shared/storage/sqlite/db/db.go
- shared/storage/sqlite/db/models.go
- shared/storage/sqlite/db/query.sql.go
- shared/storage/sqlite/file.go
- shared/storage/sqlite/reader.go
- shared/storage/sqlite/writer.go
- domain/web/tssrv/LICENSE
- domain/web/tssrv/tailscale.go
- shared/vcs/filelog.go
- shared/vcs/repository.go
- domain/web/mux.go
- domain/web/website.go
- main.go
- shared/storage/sqlite/query.sql
- shared/storage/sqlite/schema.sql
- sqlc.yaml
- templates/calendar.go
- templates/error.go
- templates/files.go
- templates/gopkg.go
- templates/homepage.go
- templates/layout.go
- templates/list.go
- templates/page.go
- templates/post.go
M .ko.yaml → .ko.yaml
@@ -5,5 +5,5 @@ flags: - -tags - timetzdata ldflags: - - -X alin.ovh/homestead/internal/server.CommitSHA={{ .Git.FullCommit }} - - -X alin.ovh/homestead/internal/server.ShortSHA={{ .Git.ShortCommit }} + - -X alin.ovh/homestead/domain/web/server.CommitSHA={{ .Git.FullCommit }} + - -X alin.ovh/homestead/domain/web/server.ShortSHA={{ .Git.ShortCommit }}
M cmd/barkeep/main.go → cmd/barkeep/main.go
@@ -7,9 +7,9 @@ "os" "github.com/ardanlabs/conf/v3" - "alin.ovh/homestead/internal/publisher" - "alin.ovh/homestead/internal/server" - "alin.ovh/homestead/internal/tssrv" + "alin.ovh/homestead/domain/content/publisher" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/domain/web/tssrv" "alin.ovh/x/log" )
M cmd/build/main.go → cmd/build/main.go
@@ -7,13 +7,13 @@ "fmt" "os" "path/filepath" - "alin.ovh/homestead/internal/builder" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/file" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/files" - "alin.ovh/homestead/internal/storage/sqlite" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content/builder" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/file" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/files" + "alin.ovh/homestead/shared/storage/sqlite" + "alin.ovh/homestead/shared/vcs" "alin.ovh/x/log" "github.com/ardanlabs/conf/v3"
M internal/atom/atom.go → domain/indieweb/atom/atom.go
@@ -6,8 +6,8 @@ "encoding/xml" "net/url" "time" + "alin.ovh/homestead/shared/config" "github.com/Southclaws/fault" - "alin.ovh/homestead/internal/config" ) func MakeTagURI(config *config.Config, specific string) string {
M internal/builder/builder.go → domain/content/builder/builder.go
@@ -9,13 +9,13 @@ "path/filepath" "slices" "time" - "alin.ovh/homestead/internal/buffer" - "alin.ovh/homestead/internal/builder/template" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" - "alin.ovh/homestead/internal/sitemap" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/domain/content/builder/template" + "alin.ovh/homestead/domain/indieweb/sitemap" + "alin.ovh/homestead/shared/buffer" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/vcs" "alin.ovh/homestead/templates" "alin.ovh/x/log"
M internal/builder/template/template.go → domain/content/builder/template/template.go
@@ -6,9 +6,9 @@ "encoding/xml" "io" "text/template" - "alin.ovh/homestead/internal/atom" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/domain/indieweb/atom" + "alin.ovh/homestead/shared/config" "alin.ovh/homestead/templates" "github.com/PuerkitoBio/goquery"
M internal/calendar/calendar.go → domain/calendar/calendar.go
@@ -11,13 +11,13 @@ "os" "slices" "time" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" - "alin.ovh/x/log" ical "vimagination.zapto.org/ics" - "alin.ovh/homestead/internal/cache" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/cache" + "alin.ovh/homestead/shared/config" ) const Filename = "calendar.ics"
M internal/content/posts.go → domain/content/posts.go
@@ -12,8 +12,8 @@ "slices" "strings" "time" - "alin.ovh/homestead/internal/markdown" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content/markdown" + "alin.ovh/homestead/shared/vcs" "alin.ovh/x/log" "github.com/Southclaws/fault"
M internal/fetcher/fetcher.go → domain/content/fetcher/fetcher.go
@@ -15,12 +15,12 @@ "strconv" "strings" "time" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/events" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" "github.com/google/renameio/v2" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/events" - "alin.ovh/x/log" ) var files = []string{"config.toml", "site.db"}
M internal/publisher/app.go → domain/content/publisher/app.go
@@ -7,9 +7,9 @@ "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" "go.hacdias.com/indielib/indieauth" - "alin.ovh/homestead/internal/config" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/shared/config" "alin.ovh/homestead/templates" "alin.ovh/x/log" )
M internal/publisher/mux.go → domain/content/publisher/mux.go
@@ -3,8 +3,8 @@ import ( "net/http" - ihttp "alin.ovh/homestead/internal/http" - pubtpl "alin.ovh/homestead/internal/publisher/templates" + pubtpl "alin.ovh/homestead/domain/content/publisher/templates" + ihttp "alin.ovh/homestead/domain/web/middleware" "alin.ovh/homestead/templates" )
M internal/server/server.go → domain/web/server/server.go
@@ -7,8 +7,8 @@ "fmt" "net/http" "time" - "github.com/osdevisnot/sorvor/pkg/livereload" "alin.ovh/x/log" + "github.com/osdevisnot/sorvor/pkg/livereload" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg"
M internal/server/tcp.go → domain/web/server/tcp.go
@@ -4,8 +4,8 @@ import ( "net" "strconv" - "github.com/Southclaws/fault" "alin.ovh/x/listenfd" + "github.com/Southclaws/fault" ) func (s *Server) serveTCP() error {
M internal/sitemap/sitemap.go → domain/indieweb/sitemap/sitemap.go
@@ -4,7 +4,7 @@ import ( "io" "time" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" "github.com/snabb/sitemap" )
M internal/stats/goatcounter/count.go → domain/analytics/goatcounter/count.go
@@ -8,10 +8,10 @@ "io" "net/http" "time" + "alin.ovh/homestead/shared/config" + "alin.ovh/x/log" "github.com/Southclaws/fault" "github.com/Southclaws/fault/fmsg" - "alin.ovh/homestead/internal/config" - "alin.ovh/x/log" ) const timeout = 5 * time.Second
M internal/website/mux.go → domain/web/mux.go
@@ -8,8 +8,8 @@ "regexp" "slices" "strings" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" "alin.ovh/homestead/templates" "github.com/kevinpollet/nego"
M internal/website/website.go → domain/web/website.go
@@ -9,18 +9,18 @@ "slices" "sync" "time" - "alin.ovh/homestead/internal/calendar" - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/events" - "alin.ovh/homestead/internal/fetcher" - "alin.ovh/homestead/internal/file" - ihttp "alin.ovh/homestead/internal/http" - "alin.ovh/homestead/internal/server" - "alin.ovh/homestead/internal/stats" - "alin.ovh/homestead/internal/stats/goatcounter" - "alin.ovh/homestead/internal/stats/nullcounter" - "alin.ovh/homestead/internal/storage" - "alin.ovh/homestead/internal/storage/sqlite" + stats "alin.ovh/homestead/domain/analytics" + "alin.ovh/homestead/domain/analytics/goatcounter" + "alin.ovh/homestead/domain/analytics/nullcounter" + "alin.ovh/homestead/domain/calendar" + "alin.ovh/homestead/domain/content/fetcher" + ihttp "alin.ovh/homestead/domain/web/middleware" + "alin.ovh/homestead/domain/web/server" + "alin.ovh/homestead/shared/config" + "alin.ovh/homestead/shared/events" + "alin.ovh/homestead/shared/file" + "alin.ovh/homestead/shared/storage" + "alin.ovh/homestead/shared/storage/sqlite" "alin.ovh/homestead/templates" "alin.ovh/x/log" "github.com/Southclaws/fault"
M sqlc.yaml → sqlc.yaml
@@ -1,11 +1,11 @@ version: "2" sql: - engine: "sqlite" - queries: "query.sql" - schema: "schema.sql" + queries: "shared/storage/sqlite/query.sql" + schema: "shared/storage/sqlite/schema.sql" database: uri: "file:db.sqlite3?mode=rwc" gen: go: - out: "internal/storage/sqlite/db" + out: "shared/storage/sqlite/db" emit_prepared_queries: true
M templates/calendar.go → templates/calendar.go
@@ -9,7 +9,7 @@ c "alin.ovh/gomponents/components" . "alin.ovh/gomponents/html" "vimagination.zapto.org/ics" - "alin.ovh/homestead/internal/calendar" + "alin.ovh/homestead/domain/calendar" ) func CalendarPage(
M templates/error.go → templates/error.go
@@ -3,10 +3,9 @@ import ( "strconv" - "alin.ovh/homestead/internal/http" - g "alin.ovh/gomponents" . "alin.ovh/gomponents/html" + http "alin.ovh/homestead/domain/web/middleware" ) func Error(site SiteSettings, err *http.Error) g.Node {
M templates/files.go → templates/files.go
@@ -4,7 +4,7 @@ import ( "io/fs" "os" - "alin.ovh/homestead/internal/env" + "alin.ovh/homestead/shared/env" ) var (
M templates/gopkg.go → templates/gopkg.go
@@ -6,7 +6,7 @@ "net/url" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" ) type GoPackageVars struct {@@ -77,6 +77,7 @@ func must[T any](t T, err error) T { if err != nil { panic(err) } + return t }
M templates/homepage.go → templates/homepage.go
@@ -1,8 +1,8 @@ package templates import ( - "alin.ovh/homestead/internal/config" - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/config" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/layout.go → templates/layout.go
@@ -3,7 +3,7 @@ import ( "io" - "alin.ovh/homestead/internal/config" + "alin.ovh/homestead/shared/config" "github.com/Southclaws/fault" "github.com/alanpearce/htmlformat"
M templates/list.go → templates/list.go
@@ -1,7 +1,7 @@ package templates import ( - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/page.go → templates/page.go
@@ -1,7 +1,7 @@ package templates import ( - "alin.ovh/homestead/internal/content" + "alin.ovh/homestead/domain/content" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"
M templates/post.go → templates/post.go
@@ -3,8 +3,8 @@ import ( "time" - "alin.ovh/homestead/internal/content" - "alin.ovh/homestead/internal/vcs" + "alin.ovh/homestead/domain/content" + "alin.ovh/homestead/shared/vcs" g "alin.ovh/gomponents" . "alin.ovh/gomponents/html"