diff options
-rw-r--r-- | cmd/build/main.go | 4 | ||||
-rw-r--r-- | cmd/cspgenerator/cspgenerator.go | 4 | ||||
-rw-r--r-- | cmd/server/main.go | 4 | ||||
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | internal/atom/atom.go | 2 | ||||
-rw-r--r-- | internal/builder/builder.go | 10 | ||||
-rw-r--r-- | internal/builder/template.go | 7 | ||||
-rw-r--r-- | internal/config/config.go | 3 | ||||
-rw-r--r-- | internal/content/posts.go | 3 | ||||
-rw-r--r-- | internal/listenfd/listenfd.go | 3 | ||||
-rw-r--r-- | internal/server/dev.go | 3 | ||||
-rw-r--r-- | internal/server/logging.go | 3 | ||||
-rw-r--r-- | internal/server/mime.go | 3 | ||||
-rw-r--r-- | internal/server/server.go | 10 | ||||
-rw-r--r-- | internal/server/tcp.go | 2 | ||||
-rw-r--r-- | internal/server/tls.go | 5 | ||||
-rw-r--r-- | internal/sitemap/sitemap.go | 3 | ||||
-rw-r--r-- | internal/vcs/repository.go | 5 | ||||
-rw-r--r-- | internal/website/filemap.go | 2 | ||||
-rw-r--r-- | internal/website/mux.go | 9 | ||||
-rw-r--r-- | templates/error.templ | 4 | ||||
-rw-r--r-- | templates/homepage.templ | 4 | ||||
-rw-r--r-- | templates/list.templ | 4 | ||||
-rw-r--r-- | templates/page.templ | 4 | ||||
-rw-r--r-- | templates/post.templ | 4 | ||||
-rw-r--r-- | templates/tags.templ | 2 |
26 files changed, 60 insertions, 49 deletions
diff --git a/cmd/build/main.go b/cmd/build/main.go index 08bf10e..e79cd14 100644 --- a/cmd/build/main.go +++ b/cmd/build/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "website/internal/builder" - "website/internal/log" + "go.alanpearce.eu/website/internal/builder" + "go.alanpearce.eu/website/internal/log" "github.com/ardanlabs/conf/v3" "github.com/pkg/errors" diff --git a/cmd/cspgenerator/cspgenerator.go b/cmd/cspgenerator/cspgenerator.go index 89d2718..1b9b9ba 100644 --- a/cmd/cspgenerator/cspgenerator.go +++ b/cmd/cspgenerator/cspgenerator.go @@ -1,8 +1,8 @@ package main import ( - "website/internal/config" - "website/internal/log" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/log" ) func main() { diff --git a/cmd/server/main.go b/cmd/server/main.go index 2f1674e..c332457 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -6,8 +6,8 @@ import ( "os" "os/signal" - "website/internal/log" - "website/internal/server" + "go.alanpearce.eu/website/internal/log" + "go.alanpearce.eu/website/internal/server" "github.com/ardanlabs/conf/v3" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index ba85a41..0639a1d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module website +module go.alanpearce.eu/website go 1.22.1 diff --git a/internal/atom/atom.go b/internal/atom/atom.go index 19ad0d1..601c125 100644 --- a/internal/atom/atom.go +++ b/internal/atom/atom.go @@ -4,7 +4,7 @@ import ( "encoding/xml" "time" - "website/internal/config" + "go.alanpearce.eu/website/internal/config" ) func MakeTagURI(config *config.Config, specific string) string { diff --git a/internal/builder/builder.go b/internal/builder/builder.go index a4e44c6..f190b6a 100644 --- a/internal/builder/builder.go +++ b/internal/builder/builder.go @@ -10,11 +10,11 @@ import ( "slices" "time" - "website/internal/config" - "website/internal/content" - "website/internal/log" - "website/internal/sitemap" - "website/templates" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/content" + "go.alanpearce.eu/website/internal/log" + "go.alanpearce.eu/website/internal/sitemap" + "go.alanpearce.eu/website/templates" "github.com/a-h/templ" mapset "github.com/deckarep/golang-set/v2" diff --git a/internal/builder/template.go b/internal/builder/template.go index 0be3214..91a40c4 100644 --- a/internal/builder/template.go +++ b/internal/builder/template.go @@ -7,9 +7,10 @@ import ( "path/filepath" "strings" "text/template" - "website/internal/atom" - "website/internal/config" - "website/internal/content" + + "go.alanpearce.eu/website/internal/atom" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/content" "github.com/PuerkitoBio/goquery" "github.com/antchfx/xmlquery" diff --git a/internal/config/config.go b/internal/config/config.go index ca4782d..deb70e6 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -4,7 +4,8 @@ import ( "io/fs" "net/url" "path/filepath" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" "github.com/BurntSushi/toml" "github.com/pkg/errors" diff --git a/internal/content/posts.go b/internal/content/posts.go index 5185d06..d56688d 100644 --- a/internal/content/posts.go +++ b/internal/content/posts.go @@ -8,7 +8,8 @@ import ( "slices" "strings" "time" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" "github.com/adrg/frontmatter" mapset "github.com/deckarep/golang-set/v2" diff --git a/internal/listenfd/listenfd.go b/internal/listenfd/listenfd.go index 651c245..a45637e 100644 --- a/internal/listenfd/listenfd.go +++ b/internal/listenfd/listenfd.go @@ -5,7 +5,8 @@ import ( "net" "os" "strconv" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" "github.com/pkg/errors" ) diff --git a/internal/server/dev.go b/internal/server/dev.go index aac869d..b984704 100644 --- a/internal/server/dev.go +++ b/internal/server/dev.go @@ -9,7 +9,8 @@ import ( "path/filepath" "slices" "time" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" "github.com/fsnotify/fsnotify" "github.com/pkg/errors" diff --git a/internal/server/logging.go b/internal/server/logging.go index 7df35d7..20f0a92 100644 --- a/internal/server/logging.go +++ b/internal/server/logging.go @@ -2,7 +2,8 @@ package server import ( "net/http" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" ) type LoggingResponseWriter struct { diff --git a/internal/server/mime.go b/internal/server/mime.go index 696a0ad..3a1ec8a 100644 --- a/internal/server/mime.go +++ b/internal/server/mime.go @@ -2,7 +2,8 @@ package server import ( "mime" - "website/internal/log" + + "go.alanpearce.eu/website/internal/log" ) var newMIMEs = map[string]string{ diff --git a/internal/server/server.go b/internal/server/server.go index c7b5659..c17c8d6 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -13,11 +13,11 @@ import ( "strings" "time" - "website/internal/builder" - cfg "website/internal/config" - "website/internal/log" - "website/internal/vcs" - "website/internal/website" + "go.alanpearce.eu/website/internal/builder" + cfg "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/log" + "go.alanpearce.eu/website/internal/vcs" + "go.alanpearce.eu/website/internal/website" "github.com/ardanlabs/conf/v3" "github.com/osdevisnot/sorvor/pkg/livereload" diff --git a/internal/server/tcp.go b/internal/server/tcp.go index b38da3d..4efde7d 100644 --- a/internal/server/tcp.go +++ b/internal/server/tcp.go @@ -1,7 +1,7 @@ package server import ( - "website/internal/listenfd" + "go.alanpearce.eu/website/internal/listenfd" ) func (s *Server) serveTCP() error { diff --git a/internal/server/tls.go b/internal/server/tls.go index fa9e69a..d48b5df 100644 --- a/internal/server/tls.go +++ b/internal/server/tls.go @@ -6,8 +6,9 @@ import ( "net" "net/http" "strconv" - "website/internal/listenfd" - "website/internal/log" + + "go.alanpearce.eu/website/internal/listenfd" + "go.alanpearce.eu/website/internal/log" "github.com/ardanlabs/conf/v3" "github.com/caddyserver/caddy/v2" diff --git a/internal/sitemap/sitemap.go b/internal/sitemap/sitemap.go index a45ebd9..b166f73 100644 --- a/internal/sitemap/sitemap.go +++ b/internal/sitemap/sitemap.go @@ -3,7 +3,8 @@ package sitemap import ( "io" "time" - "website/internal/config" + + "go.alanpearce.eu/website/internal/config" "github.com/snabb/sitemap" ) diff --git a/internal/vcs/repository.go b/internal/vcs/repository.go index 625fbd2..db212e9 100644 --- a/internal/vcs/repository.go +++ b/internal/vcs/repository.go @@ -2,8 +2,9 @@ package vcs import ( "os" - "website/internal/config" - "website/internal/log" + + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/log" "github.com/go-git/go-git/v5" "github.com/pkg/errors" diff --git a/internal/website/filemap.go b/internal/website/filemap.go index 28dcd40..8e16d7e 100644 --- a/internal/website/filemap.go +++ b/internal/website/filemap.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "website/internal/log" + "go.alanpearce.eu/website/internal/log" "github.com/pkg/errors" ) diff --git a/internal/website/mux.go b/internal/website/mux.go index 265dd20..0c2a47d 100644 --- a/internal/website/mux.go +++ b/internal/website/mux.go @@ -4,10 +4,11 @@ import ( "encoding/json" "net/http" "strings" - "website/internal/config" - ihttp "website/internal/http" - "website/internal/log" - "website/templates" + + "go.alanpearce.eu/website/internal/config" + ihttp "go.alanpearce.eu/website/internal/http" + "go.alanpearce.eu/website/internal/log" + "go.alanpearce.eu/website/templates" "github.com/benpate/digit" "github.com/kevinpollet/nego" diff --git a/templates/error.templ b/templates/error.templ index c336ea9..369cb83 100644 --- a/templates/error.templ +++ b/templates/error.templ @@ -1,8 +1,8 @@ package templates import ( - "website/internal/config" - "website/internal/http" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/http" "strconv" ) diff --git a/templates/homepage.templ b/templates/homepage.templ index 611a8ff..aa61c40 100644 --- a/templates/homepage.templ +++ b/templates/homepage.templ @@ -1,8 +1,8 @@ package templates import ( - "website/internal/config" - "website/internal/content" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/content" ) templ Homepage(config *config.Config, posts []content.Post, content string) { diff --git a/templates/list.templ b/templates/list.templ index 94ccf5a..fc59677 100644 --- a/templates/list.templ +++ b/templates/list.templ @@ -1,8 +1,8 @@ package templates import ( - "website/internal/config" - "website/internal/content" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/content" ) templ TagPage(config *config.Config, tag string, posts []content.Post, path string) { diff --git a/templates/page.templ b/templates/page.templ index cf08817..e5cb073 100644 --- a/templates/page.templ +++ b/templates/page.templ @@ -3,7 +3,7 @@ package templates import ( "io/fs" - "website/internal/config" + "go.alanpearce.eu/website/internal/config" ) var ( @@ -70,7 +70,7 @@ templ Page(site *config.Config, page PageSettings) { <footer> Content is <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>. - <a href="https://git.alanpearce.eu/website/">Site source code</a> is + <a href="https://git.alanpearce.eu/go.alanpearce.eu/website/">Site source code</a> is <a href="https://opensource.org/licenses/MIT">MIT</a> </footer> @counter(site, page.Path, page.Title) diff --git a/templates/post.templ b/templates/post.templ index c432e57..9717b4e 100644 --- a/templates/post.templ +++ b/templates/post.templ @@ -2,8 +2,8 @@ package templates import ( "time" - "website/internal/config" - "website/internal/content" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/website/internal/content" ) func Unsafe(html string) templ.Component { diff --git a/templates/tags.templ b/templates/tags.templ index 5e9878a..c872a0d 100644 --- a/templates/tags.templ +++ b/templates/tags.templ @@ -1,6 +1,6 @@ package templates -import "website/internal/config" +import "go.alanpearce.eu/website/internal/config" templ tagLink(tag string, attrs templ.Attributes) { <a { attrs... } href={ templ.SafeURL("/tags/" + tag) }>#{ tag }</a> |