From 654f273baaaba63bf73fd46a65ecd1440c4758fe Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Tue, 4 Jun 2019 13:35:44 -0400 Subject: [minor] move to within.website/x (#14) * move to within.website/x * Update user_agent.go * cmd/within.website: add bot info page --- cmd/appsluggr/main.go | 2 +- cmd/dnsd/main.go | 4 ++-- cmd/ff-primitive/main.go | 2 +- cmd/johaus/build.go | 6 +++--- cmd/johaus/main.go | 2 +- cmd/la-baujmi/fact.go | 2 +- cmd/la-baujmi/fact_test.go | 2 +- cmd/la-baujmi/main.go | 6 +++--- cmd/license/main.go | 4 ++-- cmd/mainsanow/main.go | 4 ++-- cmd/minipaas/main.go | 4 ++-- cmd/mkapp/main.go | 4 ++-- cmd/priorworkgen/main.go | 2 +- cmd/quickserv/main.go | 2 +- cmd/relayd/main.go | 2 +- cmd/thumber/main.go | 2 +- cmd/tlstestd/main.go | 2 +- cmd/within.website/build.go | 6 +++--- cmd/within.website/main.go | 18 ++++++++++++++++-- 19 files changed, 45 insertions(+), 31 deletions(-) (limited to 'cmd') diff --git a/cmd/appsluggr/main.go b/cmd/appsluggr/main.go index b4701a1..891b40c 100644 --- a/cmd/appsluggr/main.go +++ b/cmd/appsluggr/main.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/otiai10/copy" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/dnsd/main.go b/cmd/dnsd/main.go index d6e4df4..6cbc442 100644 --- a/cmd/dnsd/main.go +++ b/cmd/dnsd/main.go @@ -11,8 +11,8 @@ import ( "time" "fmt" - "github.com/Xe/x/web" - "github.com/Xe/x/internal" + "within.website/x/web" + "within.website/x/internal" "github.com/miekg/dns" "github.com/mmikulicic/stringlist" ) diff --git a/cmd/ff-primitive/main.go b/cmd/ff-primitive/main.go index 3ee0882..3de83a6 100644 --- a/cmd/ff-primitive/main.go +++ b/cmd/ff-primitive/main.go @@ -8,7 +8,7 @@ import ( "runtime" "runtime/pprof" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/fogleman/primitive/primitive" farbfeld "github.com/hullerob/go.farbfeld" ) diff --git a/cmd/johaus/build.go b/cmd/johaus/build.go index 5241feb..43f4655 100644 --- a/cmd/johaus/build.go +++ b/cmd/johaus/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/kahless" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/kahless" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/cmd/johaus/main.go b/cmd/johaus/main.go index eaba012..6926b90 100644 --- a/cmd/johaus/main.go +++ b/cmd/johaus/main.go @@ -7,7 +7,7 @@ import ( "log" "net/http" - "github.com/Xe/x/internal" + "within.website/x/internal" "within.website/johaus/parser" _ "within.website/johaus/parser/camxes-beta" "within.website/johaus/pretty" diff --git a/cmd/la-baujmi/fact.go b/cmd/la-baujmi/fact.go index a421d1e..3a92357 100644 --- a/cmd/la-baujmi/fact.go +++ b/cmd/la-baujmi/fact.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" ) // Selbri is a predicate relationship between its arguments. The name comes from diff --git a/cmd/la-baujmi/fact_test.go b/cmd/la-baujmi/fact_test.go index 43f7a4b..7c08552 100644 --- a/cmd/la-baujmi/fact_test.go +++ b/cmd/la-baujmi/fact_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/web/tokiponatokens" "github.com/kr/pretty" ) diff --git a/cmd/la-baujmi/main.go b/cmd/la-baujmi/main.go index 5183909..393b13c 100644 --- a/cmd/la-baujmi/main.go +++ b/cmd/la-baujmi/main.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "github.com/Xe/x/internal" - _ "github.com/Xe/x/internal/tokipona" - "github.com/Xe/x/web/tokiponatokens" + "within.website/x/internal" + _ "within.website/x/internal/tokipona" + "within.website/x/web/tokiponatokens" "github.com/mndrix/golog" line "github.com/peterh/liner" ) diff --git a/cmd/license/main.go b/cmd/license/main.go index 0f93df9..56d639d 100644 --- a/cmd/license/main.go +++ b/cmd/license/main.go @@ -10,8 +10,8 @@ import ( "text/template" "time" - "github.com/Xe/x/internal" - "github.com/Xe/x/cmd/license/licenses" + "within.website/x/internal" + "within.website/x/cmd/license/licenses" ) var ( diff --git a/cmd/mainsanow/main.go b/cmd/mainsanow/main.go index bb3df15..f75ec49 100644 --- a/cmd/mainsanow/main.go +++ b/cmd/mainsanow/main.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/Xe/x/internal" - "github.com/Xe/x/internal/mainsa" + "within.website/x/internal" + "within.website/x/internal/mainsa" ) func main() { diff --git a/cmd/minipaas/main.go b/cmd/minipaas/main.go index 24b2fda..2a6e8e7 100644 --- a/cmd/minipaas/main.go +++ b/cmd/minipaas/main.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/Xe/x/internal" - "github.com/Xe/x/internal/minipaas" + "within.website/x/internal" + "within.website/x/internal/minipaas" ) func main() { diff --git a/cmd/mkapp/main.go b/cmd/mkapp/main.go index 376ce52..1827b9c 100644 --- a/cmd/mkapp/main.go +++ b/cmd/mkapp/main.go @@ -6,14 +6,14 @@ import ( "log" "github.com/McKael/madon/v2" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( instance = flag.String("instance", "", "mastodon instance") appName = flag.String("app-name", "Xe/x bot", "app name for mastodon") redirectURI = flag.String("redirect-uri", "urn:ietf:wg:oauth:2.0:oob", "redirect URI for app users") - website = flag.String("website", "https://github.com/Xe/x", "website for users that click the app name") + website = flag.String("website", "https://within.website/x", "website for users that click the app name") username = flag.String("username", "", "username to generate token") password = flag.String("password", "", "password to generate token") ) diff --git a/cmd/priorworkgen/main.go b/cmd/priorworkgen/main.go index f484c27..97fc6ce 100644 --- a/cmd/priorworkgen/main.go +++ b/cmd/priorworkgen/main.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/google/go-github/github" _ "github.com/joho/godotenv/autoload" "golang.org/x/oauth2" diff --git a/cmd/quickserv/main.go b/cmd/quickserv/main.go index 7506320..caea45d 100644 --- a/cmd/quickserv/main.go +++ b/cmd/quickserv/main.go @@ -5,7 +5,7 @@ import ( "log" "net/http" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/relayd/main.go b/cmd/relayd/main.go index 97ff5b5..71cee2b 100644 --- a/cmd/relayd/main.go +++ b/cmd/relayd/main.go @@ -11,7 +11,7 @@ import ( "net/url" "time" - "github.com/Xe/x/internal" + "within.website/x/internal" "golang.org/x/crypto/acme/autocert" ) diff --git a/cmd/thumber/main.go b/cmd/thumber/main.go index c968853..2da2ad6 100644 --- a/cmd/thumber/main.go +++ b/cmd/thumber/main.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/Xe/x/internal" + "within.website/x/internal" "github.com/disintegration/imaging" ) diff --git a/cmd/tlstestd/main.go b/cmd/tlstestd/main.go index 0315406..660972f 100644 --- a/cmd/tlstestd/main.go +++ b/cmd/tlstestd/main.go @@ -5,7 +5,7 @@ import ( "net/http" "log" - "github.com/Xe/x/internal" + "within.website/x/internal" ) var ( diff --git a/cmd/within.website/build.go b/cmd/within.website/build.go index 40ab861..43923fb 100644 --- a/cmd/within.website/build.go +++ b/cmd/within.website/build.go @@ -8,9 +8,9 @@ import ( "log" "os" - "github.com/Xe/x/internal/kahless" - "github.com/Xe/x/internal/minipaas" - "github.com/Xe/x/internal/yeet" + "within.website/x/internal/kahless" + "within.website/x/internal/minipaas" + "within.website/x/internal/yeet" ) func main() { diff --git a/cmd/within.website/main.go b/cmd/within.website/main.go index 834d70a..fbcb552 100644 --- a/cmd/within.website/main.go +++ b/cmd/within.website/main.go @@ -5,12 +5,12 @@ import ( "flag" "net/http" - "github.com/Xe/x/internal" - "github.com/Xe/x/vanity" assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/mmikulicic/stringlist" "within.website/ln" "within.website/ln/opname" + "within.website/x/internal" + "within.website/x/vanity" ) //go:generate go-bindata -pkg main static @@ -85,6 +85,11 @@ func main() { w.Write([]byte(indexTemplate)) }) + http.HandleFunc("/.x.botinfo", func(w http.ResponseWriter, r *http.Request) { + w.Header().Add("Content-Type", "text/html") + w.Write([]byte(botInfoPage)) + }) + ln.Log(ctx, ln.F{"port": *port}, ln.Info("Listening on HTTP")) http.ListenAndServe(":"+*port, nil) @@ -116,3 +121,12 @@ const indexTemplate = ` ` + +const botInfoPage = ` +
+

x repo bots

+ +Hello, if you are reading this, you have found this URL in your access logs. + +If one of these programs is doing something you don't want them to do, please contact me or open an issue here. +
` -- cgit v1.2.3