From 1833d56686768494dc5161f5ea3536bd587e1870 Mon Sep 17 00:00:00 2001 From: James Mills Date: Tue, 13 Jul 2021 08:33:43 +1000 Subject: [PATCH] Fix import paths --- go.mod | 4 ++-- go.sum | 8 ++++---- internal/bitcask_store.go | 2 +- internal/rice-box.go | 2 +- internal/server.go | 2 +- internal/templates/base.html | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 5114455..e227e90 100644 --- a/go.mod +++ b/go.mod @@ -37,8 +37,8 @@ require ( github.com/justinas/nosurf v1.1.1 github.com/mitchellh/copystructure v1.1.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/prologic/bitcask v0.3.10 - github.com/prologic/observe v0.0.0-20181231082615-747b185a0928 + git.mills.io/prologic/bitcask v0.3.10 + git.mills.io/prologic/observe v0.0.0-20181231082615-747b185a0928 github.com/prometheus/client_golang v1.9.0 // indirect github.com/prometheus/procfs v0.4.0 // indirect github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect diff --git a/go.sum b/go.sum index e239348..210d07e 100644 --- a/go.sum +++ b/go.sum @@ -456,10 +456,10 @@ github.com/plar/go-adaptive-radix-tree v1.0.4/go.mod h1:Ot8d28EII3i7Lv4PSvBlF8ej github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0= -github.com/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY= -github.com/prologic/observe v0.0.0-20181231082615-747b185a0928 h1:B63MGEQCv0W1ltswEDOsd1hlRGzZqnW7Vb51AMi3tpI= -github.com/prologic/observe v0.0.0-20181231082615-747b185a0928/go.mod h1:tEdBKdkpsOZCgueJIZwZREodFg5oRhLkTWWNiQ5y84E= +git.mills.io/prologic/bitcask v0.3.10 h1:HXygU8zCvW5gLpZ8aQECPk5iV/YQ3hcqdg/zVeES6s0= +git.mills.io/prologic/bitcask v0.3.10/go.mod h1:8RKJdbHLE7HFGLYSGu9slnYXSV7DMIucwVkaIYOk9GY= +git.mills.io/prologic/observe v0.0.0-20181231082615-747b185a0928 h1:B63MGEQCv0W1ltswEDOsd1hlRGzZqnW7Vb51AMi3tpI= +git.mills.io/prologic/observe v0.0.0-20181231082615-747b185a0928/go.mod h1:tEdBKdkpsOZCgueJIZwZREodFg5oRhLkTWWNiQ5y84E= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= diff --git a/internal/bitcask_store.go b/internal/bitcask_store.go index cc11df3..1284ff3 100644 --- a/internal/bitcask_store.go +++ b/internal/bitcask_store.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/prologic/bitcask" + "git.mills.io/prologic/bitcask" log "github.com/sirupsen/logrus" "git.mills.io/prologic/spyda/internal/session" diff --git a/internal/rice-box.go b/internal/rice-box.go index 034b866..de91f04 100644 --- a/internal/rice-box.go +++ b/internal/rice-box.go @@ -279,7 +279,7 @@ func init() { Filename: "base.html", FileModTime: time.Unix(1612351167, 0), - Content: string("{{define \"base\"}}\n\n\n\n\n {{ if $.Debug }}\n \n \n \n \n \n {{ else }}\n \n \n {{ end }}\n\n \n\n \n \n\n {{ .InstanceName }} {{ .Title }}\n {{ with .Meta.Title }}\n {{ end }}\n {{ with .Meta.Author }}\n {{ end }}\n {{ with .Meta.Keywords }}\n {{ end }}\n {{ with .Meta.Description }}\n {{ end }}\n\n \n {{ with .Meta.Title }}\n {{ end }}\n {{ with .Meta.Description }}\n {{ end }}\n {{ with .Meta.UpdatedAt }}\n {{ end }}\n {{ with .Meta.Image }}\n {{ end }}\n {{ with .Meta.URL }}\n {{ end }}\n \n\n\n\n \n
\n {{template \"content\" . }}\n
\n \n This search engine is a work-in-progress.\n Please contact Support\n if you have any questions, concerns or feedback!\n \n
\n
\n \n {{ if $.Debug }}\n \n \n \n \n {{ else }}\n \n {{ end }}\n\n\n\n{{end}}\n"), + Content: string("{{define \"base\"}}\n\n\n\n\n {{ if $.Debug }}\n \n \n \n \n \n {{ else }}\n \n \n {{ end }}\n\n \n\n \n \n\n {{ .InstanceName }} {{ .Title }}\n {{ with .Meta.Title }}\n {{ end }}\n {{ with .Meta.Author }}\n {{ end }}\n {{ with .Meta.Keywords }}\n {{ end }}\n {{ with .Meta.Description }}\n {{ end }}\n\n \n {{ with .Meta.Title }}\n {{ end }}\n {{ with .Meta.Description }}\n {{ end }}\n {{ with .Meta.UpdatedAt }}\n {{ end }}\n {{ with .Meta.Image }}\n {{ end }}\n {{ with .Meta.URL }}\n {{ end }}\n \n\n\n\n \n
\n {{template \"content\" . }}\n
\n \n This search engine is a work-in-progress.\n Please contact Support\n if you have any questions, concerns or feedback!\n \n
\n
\n \n {{ if $.Debug }}\n \n \n \n \n {{ else }}\n \n {{ end }}\n\n\n\n{{end}}\n"), } filer := &embedded.EmbeddedFile{ Filename: "cache.html", diff --git a/internal/server.go b/internal/server.go index 4631560..e8ebb7b 100644 --- a/internal/server.go +++ b/internal/server.go @@ -14,7 +14,7 @@ import ( "github.com/NYTimes/gziphandler" "github.com/gabstv/merger" "github.com/justinas/nosurf" - "github.com/prologic/observe" + "git.mills.io/prologic/observe" "github.com/robfig/cron" log "github.com/sirupsen/logrus" "github.com/unrolled/logger" diff --git a/internal/templates/base.html b/internal/templates/base.html index baca955..e67817a 100644 --- a/internal/templates/base.html +++ b/internal/templates/base.html @@ -97,7 +97,7 @@
spyda v{{ .SoftwareVersion }} · - © 2020 James Mills. All rights reserved. + © 2020 James Mills. All rights reserved.
About