Move to dev.mediocregopher.com/mediocre-blog.git

26 files changed, 63 insertions, 61 deletions

diff --git a/src/cfg/data_dir.go b/src/cfg/data_dir.go
index 649bc15..38d1987 100644
--- a/src/cfg/data_dir.go
+++ b/src/cfg/data_dir.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
 )
 
 // DataDir manages the blog's data directory.
diff --git a/src/cmd/hash-password/main.go b/src/cmd/hash-password/main.go
index 550509f..b32c733 100644
--- a/src/cmd/hash-password/main.go
+++ b/src/cmd/hash-password/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http"
 )
 
 func main() {
diff --git a/src/cmd/load-test-data/main.go b/src/cmd/load-test-data/main.go
index 79b9970..dfba852 100644
--- a/src/cmd/load-test-data/main.go
+++ b/src/cmd/load-test-data/main.go
@@ -7,11 +7,11 @@ import (
 	"path/filepath"
 	"time"
 
-	cfgpkg "code.betamike.com/mediocregopher/mediocre-blog/src/cfg"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	cfgpkg "dev.mediocregopher.com/mediocre-blog.git/src/cfg"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/src/cmd/mediocre-blog/main.go b/src/cmd/mediocre-blog/main.go
index deba5c3..835b2d0 100644
--- a/src/cmd/mediocre-blog/main.go
+++ b/src/cmd/mediocre-blog/main.go
@@ -7,14 +7,14 @@ import (
 	"syscall"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cache"
-	cfgpkg "code.betamike.com/mediocregopher/mediocre-blog/src/cfg"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/gmi"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cache"
+	cfgpkg "dev.mediocregopher.com/mediocre-blog.git/src/cfg"
+	"dev.mediocregopher.com/mediocre-blog.git/src/gmi"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
 func main() {
diff --git a/src/gmi/cache.go b/src/gmi/cache.go
index 5a94aed..4701673 100644
--- a/src/gmi/cache.go
+++ b/src/gmi/cache.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"git.sr.ht/~adnano/go-gemini"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cache"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cache"
 )
 
 type cacheRW struct {
diff --git a/src/gmi/gmi.go b/src/gmi/gmi.go
index 74e17e9..467ab5a 100644
--- a/src/gmi/gmi.go
+++ b/src/gmi/gmi.go
@@ -16,12 +16,12 @@ import (
 
 	"git.sr.ht/~adnano/go-gemini"
 	"git.sr.ht/~adnano/go-gemini/certificate"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cache"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cfg"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cache"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cfg"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
 // Params are used to instantiate a new API instance. All fields are required
diff --git a/src/gmi/tpl.go b/src/gmi/tpl.go
index b175a34..03d9819 100644
--- a/src/gmi/tpl.go
+++ b/src/gmi/tpl.go
@@ -16,8 +16,8 @@ import (
 	"text/template"
 
 	"git.sr.ht/~adnano/go-gemini"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
 	gmnhg "github.com/tdemin/gmnhg"
 )
 
diff --git a/src/gmi/tpl/footer.gmi b/src/gmi/tpl/footer.gmi
index 83bb379..15ee7b6 100644
--- a/src/gmi/tpl/footer.gmi
+++ b/src/gmi/tpl/footer.gmi
@@ -5,6 +5,6 @@
 
 {{ end -}}
 
-=> https://code.betamike.com/mediocregopher/mediocre-blog Source
+=> https://dev.mediocregopher.com/mediocre-blog.git Source
 
 => {{ BlogURL "wtfpl.txt" }} License for all content, if you must have one
diff --git a/src/gmi/tpl/index.gmi b/src/gmi/tpl/index.gmi
index 506c1c5..39097a6 100644
--- a/src/gmi/tpl/index.gmi
+++ b/src/gmi/tpl/index.gmi
@@ -35,7 +35,7 @@ Feel free to hmu over email or Signal if you'd like to get in touch.
 
 => https://code.betamike.com/micropelago micropelago implements the foundation of a community infrastucture.
 
-=> https://code.betamike.com/mediocregopher/mediocre-blog mediocre-blog is the CMS I designed from scratch to run this site.
+=> https://dev.mediocregopher.com/mediocre-blog.git mediocre-blog is the CMS I designed from scratch to run this site.
 
 ## Other
 
diff --git a/src/go.mod b/src/go.mod
index a8120e7..2cc6f48 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -1,14 +1,14 @@
-module code.betamike.com/mediocregopher/mediocre-blog/src
+module dev.mediocregopher.com/mediocre-blog.git/src
 
 go 1.16
 
 require (
+	dev.mediocregopher.com/mediocre-go-lib.git v0.0.0-20240511135822-4ab1176672d7 // indirect
 	git.sr.ht/~adnano/go-gemini v0.2.3
 	github.com/gomarkdown/markdown v0.0.0-20220510115730-2372b9aa33e5
 	github.com/gorilla/feeds v1.1.1
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/mattn/go-sqlite3 v1.14.8
-	github.com/mediocregopher/mediocre-go-lib/v2 v2.0.0-beta.0.0.20220506011745-cbeee71cb1ee
 	github.com/omeid/go-tarfs v0.0.0-20171018021839-bf0d15c58b89
 	github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc
 	github.com/stretchr/testify v1.7.0
diff --git a/src/go.sum b/src/go.sum
index 03b7c79..ff896d2 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,4 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+dev.mediocregopher.com/mediocre-go-lib.git v0.0.0-20240511135822-4ab1176672d7 h1:wKQ3bXzG+KQDtRAN/xaRZ4aQtJe1pccleG6V43MvFxw=
+dev.mediocregopher.com/mediocre-go-lib.git v0.0.0-20240511135822-4ab1176672d7/go.mod h1:nP+AtQWrc3k5qq5y3ABiBLkOfUPlk/FO9fpTFpF+jgs=
+dev.mediocregopher.com/mediocre-go-lib.git v2.0.0-beta.0.0.20220506011745-cbeee71cb1ee h1:AWRuhgn7iumyhPuxKwed1F1Ri2dXMwxKfp5YIdpnQIY=
+dev.mediocregopher.com/mediocre-go-lib.git v2.0.0-beta.0.0.20220506011745-cbeee71cb1ee/go.mod h1:wOZVlnKYvIbkzyCJ3dxy1k40XkirvCd1pisX2O91qoQ=
 git.sr.ht/~adnano/go-gemini v0.2.3 h1:oJ+Y0/mheZ4Vg0ABjtf5dlmvq1yoONStiaQvmWWkofc=
 git.sr.ht/~adnano/go-gemini v0.2.3/go.mod h1:hQ75Y0i5jSFL+FQ7AzWVAYr5LQsaFC7v3ZviNyj46dY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -131,8 +135,6 @@ github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mediocregopher/mediocre-go-lib/v2 v2.0.0-beta.0.0.20220506011745-cbeee71cb1ee h1:AWRuhgn7iumyhPuxKwed1F1Ri2dXMwxKfp5YIdpnQIY=
-github.com/mediocregopher/mediocre-go-lib/v2 v2.0.0-beta.0.0.20220506011745-cbeee71cb1ee/go.mod h1:wOZVlnKYvIbkzyCJ3dxy1k40XkirvCd1pisX2O91qoQ=
 github.com/mitchellh/cli v1.1.2/go.mod h1:6iaV0fGdElS6dPBx0EApTxHrcWvmJphyh2n8YBLPPZ4=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
diff --git a/src/http/apiutil/apiutil.go b/src/http/apiutil/apiutil.go
index c59104c..2151d83 100644
--- a/src/http/apiutil/apiutil.go
+++ b/src/http/apiutil/apiutil.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
 // TODO I don't think Set/GetRequestLogger are necessary? Seems sufficient to
diff --git a/src/http/assets.go b/src/http/assets.go
index 70653e0..79ab98c 100644
--- a/src/http/assets.go
+++ b/src/http/assets.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
 )
 
 func (a *api) managePostAssetsHandler() http.Handler {
diff --git a/src/http/auth.go b/src/http/auth.go
index 523ccd5..eac73b7 100644
--- a/src/http/auth.go
+++ b/src/http/auth.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/src/http/csrf.go b/src/http/csrf.go
index 8606360..707aac4 100644
--- a/src/http/csrf.go
+++ b/src/http/csrf.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
 )
 
 func checkCSRF(r *http.Request, publicURL *url.URL) error {
diff --git a/src/http/drafts.go b/src/http/drafts.go
index 90ad353..f8e4c8a 100644
--- a/src/http/drafts.go
+++ b/src/http/drafts.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
 )
 
 func (a *api) manageDraftPostsHandler() http.Handler {
diff --git a/src/http/feed.go b/src/http/feed.go
index 0472c27..eb72464 100644
--- a/src/http/feed.go
+++ b/src/http/feed.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/feeds"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
 )
 
 func (a *api) renderFeedHandler() http.Handler {
diff --git a/src/http/http.go b/src/http/http.go
index 7444e7c..fd0ea16 100644
--- a/src/http/http.go
+++ b/src/http/http.go
@@ -15,13 +15,13 @@ import (
 	"strings"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cache"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cfg"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cache"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cfg"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
 //go:embed static
diff --git a/src/http/middleware.go b/src/http/middleware.go
index 6611136..7a34e83 100644
--- a/src/http/middleware.go
+++ b/src/http/middleware.go
@@ -9,10 +9,10 @@ import (
 	"sync"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cache"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mlog"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cache"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mlog"
 )
 
 type middleware func(http.Handler) http.Handler
diff --git a/src/http/posts.go b/src/http/posts.go
index 4c1da56..ab3a18a 100644
--- a/src/http/posts.go
+++ b/src/http/posts.go
@@ -15,11 +15,11 @@ import (
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
 	"github.com/gomarkdown/markdown/parser"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/gmi"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post/asset"
-	"github.com/mediocregopher/mediocre-go-lib/v2/mctx"
+	"dev.mediocregopher.com/mediocre-blog.git/src/gmi"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post/asset"
+	"dev.mediocregopher.com/mediocre-go-lib.git/mctx"
 )
 
 func (a *api) postPreprocessFuncImage(args ...string) (string, error) {
diff --git a/src/http/tpl.go b/src/http/tpl.go
index 3f6b136..24f2453 100644
--- a/src/http/tpl.go
+++ b/src/http/tpl.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/http/apiutil"
+	"dev.mediocregopher.com/mediocre-blog.git/src/http/apiutil"
 )
 
 //go:embed tpl
diff --git a/src/http/tpl/base.html b/src/http/tpl/base.html
index 01b5386..7e7a4a9 100644
--- a/src/http/tpl/base.html
+++ b/src/http/tpl/base.html
@@ -114,7 +114,7 @@
        / 
       <a href="{{ BlogURL "feed.xml" }}">RSS</a>
       &nbsp;//&nbsp;
-      <a href="https://code.betamike.com/mediocregopher/mediocre-blog">Source</a>
+      <a href="https://dev.mediocregopher.com/mediocre-blog.git">Source</a>
       &nbsp;/&nbsp;
       <a href="{{ StaticURL "wtfpl.txt" }}">License</a>
     </header>
diff --git a/src/http/tpl/index.html b/src/http/tpl/index.html
index 6e786b0..599a666 100644
--- a/src/http/tpl/index.html
+++ b/src/http/tpl/index.html
@@ -30,7 +30,7 @@
     </li>
     <li><a href="https://github.com/mediocregopher/radix">radix</a> is for using redis with go.</li>
     <li><a href="https://code.betamike.com/micropelago">micropelago</a> implements the foundation of a community infrastucture.</li>
-    <li><a href="https://code.betamike.com/mediocregopher/mediocre-blog">mediocre-blog</a> is the CMS I designed from scratch to run this site.</li>
+    <li><a href="https://dev.mediocregopher.com/mediocre-blog.git">mediocre-blog</a> is the CMS I designed from scratch to run this site.</li>
   </ul>
 
   <h2>Other</h2>
diff --git a/src/post/asset/asset.go b/src/post/asset/asset.go
index 98acca9..9dc5172 100644
--- a/src/post/asset/asset.go
+++ b/src/post/asset/asset.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
 )
 
 var (
diff --git a/src/post/asset/asset_test.go b/src/post/asset/asset_test.go
index 88991b8..366e6a5 100644
--- a/src/post/asset/asset_test.go
+++ b/src/post/asset/asset_test.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"testing"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/post"
+	"dev.mediocregopher.com/mediocre-blog.git/src/post"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/src/post/sql.go b/src/post/sql.go
index 8f4da0a..b75f481 100644
--- a/src/post/sql.go
+++ b/src/post/sql.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"path"
 
-	"code.betamike.com/mediocregopher/mediocre-blog/src/cfg"
+	"dev.mediocregopher.com/mediocre-blog.git/src/cfg"
 	migrate "github.com/rubenv/sql-migrate"
 
 	_ "github.com/mattn/go-sqlite3" // we need dis