diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 56ea1f9..46c1987 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -79,14 +79,14 @@ and the private key file at `certs/live/$DOMAIN/privkey.pem` to twins. Pages are also available via HTTPS on the same port by default. Set this option to `true` to disable this feature. -Pages are converted automatically by [gmitohtml](https://gitlab.com/tslocum/gmitohtml). +Pages are converted automatically by [gmitohtml](https://code.rocketnine.space/tslocum/gmitohtml). ### DisableSize The size of the response body is included in the media type header by default. Set this option to `true` to disable this feature. -See [PROPOSALS.md](https://gitlab.com/tslocum/twins/blob/master/PROPOSALS.md) for more information. +See [PROPOSALS.md](https://code.rocketnine.space/tslocum/twins/src/branch/master/PROPOSALS.md) for more information. ### Path @@ -123,7 +123,7 @@ Any number of attributes may be defined for a path. ##### Cache Cache duration (in seconds). Set to `0` to disable caching entirely. This is an -out-of-spec feature. See [PROPOSALS.md](https://gitlab.com/tslocum/twins/blob/master/PROPOSALS.md) +out-of-spec feature. See [PROPOSALS.md](https://code.rocketnine.space/tslocum/twins/src/branch/master/PROPOSALS.md) for more information. ##### FastCGI diff --git a/README.md b/README.md index a850a45..5d0ab14 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # twins -[![CI status](https://gitlab.com/tslocum/twins/badges/master/pipeline.svg)](https://gitlab.com/tslocum/twins/commits/master) [![Donate](https://img.shields.io/liberapay/receives/rocketnine.space.svg?logo=liberapay)](https://liberapay.com/rocketnine.space) [Gemini](https://gemini.circumlunar.space) server @@ -19,12 +18,12 @@ This page is also available at [gemini://twins.rocketnine.space](gemini://twins. - TCP - [FastCGI](https://en.wikipedia.org/wiki/FastCGI) - Serve Gemini content via HTTPS - - Pages are converted automatically by [gmitohtml](https://gitlab.com/tslocum/gmitohtml) + - Pages are converted automatically by [gmitohtml](https://code.rocketnine.space/tslocum/gmitohtml) - Reload configuration on `SIGHUP` ## Proposals -twins includes features that are not yet part of the Gemini specification. See [PROPOSALS.md](https://gitlab.com/tslocum/twins/blob/master/PROPOSALS.md) +twins includes features that are not yet part of the Gemini specification. See [PROPOSALS.md](https://code.rocketnine.space/tslocum/twins/src/branch/master/PROPOSALS.md) ## Download @@ -32,18 +31,18 @@ twins is written in [Go](https://golang.org). Run the following command to download and build twins from source. ```bash -go get gitlab.com/tslocum/twins +go get code.rocketnine.space/tslocum/twins ``` The resulting binary is available as `~/go/bin/twins`. ## Configure -See [CONFIGURATION.md](https://gitlab.com/tslocum/twins/blob/master/CONFIGURATION.md) +See [CONFIGURATION.md](https://code.rocketnine.space/tslocum/twins/src/branch/master/CONFIGURATION.md) ## Support -Please share issues and suggestions [here](https://gitlab.com/tslocum/twins/issues). +Please share issues and suggestions [here](https://code.rocketnine.space/tslocum/twins/issues). ## Dependencies diff --git a/go.mod b/go.mod index 71e6cfa..c34eafd 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module gitlab.com/tslocum/twins +module code.rocketnine.space/tslocum/twins -go 1.15 +go 1.16 require ( + code.rocketnine.space/tslocum/gmitohtml v1.0.4 github.com/h2non/filetype v1.1.1 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/yookoala/gofast v0.6.0 - gitlab.com/tslocum/gmitohtml v1.0.3 golang.org/x/tools v0.1.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 572737d..5d0d96d 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +code.rocketnine.space/tslocum/gmitohtml v1.0.4 h1:EZsXfnP1sZx85PYNQb9XWFuF4WxSgeeTN3vxPsdGKyY= +code.rocketnine.space/tslocum/gmitohtml v1.0.4/go.mod h1:1FWEBFtkgRZgRE7ktApyFe29nm3MCNANvH/Mp8hyG54= github.com/go-restit/lzjson v0.0.0-20161206095556-efe3c53acc68/go.mod h1:7vXSKQt83WmbPeyVjCfNT9YDJ5BUFmcwFsEjI9SCvYM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -12,8 +14,6 @@ github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9 github.com/yookoala/gofast v0.6.0 h1:E5x2acfUD7GkzCf8bmIMwnV10VxDy5tUCHc5LGhluwc= github.com/yookoala/gofast v0.6.0/go.mod h1:OJU201Q6HCaE1cASckaTbMm3KB6e0cZxK0mgqfwOKvQ= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -gitlab.com/tslocum/gmitohtml v1.0.3 h1:mNEDRL5eNHAIPHI6eIi4QpwJCk97SF5efEvtZOL5j+A= -gitlab.com/tslocum/gmitohtml v1.0.3/go.mod h1:UVZEaBMmAAdEPZOUyjV5ZxiQLOkvAbGE13GXKb/b4OI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/serve_https.go b/serve_https.go index 8b7184d..e227064 100644 --- a/serve_https.go +++ b/serve_https.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "gitlab.com/tslocum/gmitohtml/pkg/gmitohtml" + "code.rocketnine.space/tslocum/gmitohtml/pkg/gmitohtml" ) var cssBytes = []byte(gmitohtml.StyleCSS)