From 6ba97afc3538724141c334f6d7779617d06d8e15 Mon Sep 17 00:00:00 2001
From: Cedric Staub <css@css.bio>
Date: Sun, 9 Aug 2020 23:56:25 +0000
Subject: [PATCH] Fix up references after repo move

---
 .travis.yml                             |  2 +-
 Dockerfile                              | 12 +++++-------
 Dockerfile-test                         | 10 ++++------
 Makefile                                |  6 +++---
 README.md                               |  8 ++++----
 auth/auth.go                            |  2 +-
 auth/auth_test.go                       |  2 +-
 doc.go                                  |  2 +-
 docs/ACCESS-FLAGS.md                    |  4 ++--
 docs/CROSS-COMPILE.md                   |  2 +-
 docs/spiffe-workload-api-demo/README.md |  2 +-
 go.mod                                  |  2 +-
 main.go                                 | 10 +++++-----
 main_test.go                            |  2 +-
 signals.go                              |  2 +-
 tls.go                                  |  2 +-
 16 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd737f8b048..4bff763abf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
   # Build Docker container
   - make docker-build
   # Make sure Docker image runs
-  - docker run --rm squareup/ghostunnel --version
+  - docker run --rm ghostunnel/ghostunnel --version
   # Cross-compile dist binaries
   - GO_VERSION=${TRAVIS_GO_VERSION} VERSION=${TRAVIS_TAG} make -f Makefile.dist dist
 
diff --git a/Dockerfile b/Dockerfile
index 932f133a2e4..04242c5b86f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,21 @@
-# Dockerfile for squareup/ghostunnel, useful as a basis for other images.
+# Dockerfile for ghostunnel/ghostunnel, useful as a basis for other images.
 #
 # To build this image:
-#     docker build -t squareup/ghostunnel .
+#     docker build -t ghostunnel/ghostunnel .
 #
 # To run ghostunnel from the image (for example):
-#     docker run --rm squareup/ghostunnel --version
+#     docker run --rm ghostunnel/ghostunnel --version
 
 FROM golang:1.14.7-alpine as build
 
-MAINTAINER Cedric Staub "cs@squareup.com"
-
 # Dependencies
 RUN apk add --no-cache --update gcc musl-dev libtool make git
 
 # Copy source
-COPY . /go/src/github.com/square/ghostunnel
+COPY . /go/src/github.com/ghostunnel/ghostunnel
 
 # Build
-RUN cd /go/src/github.com/square/ghostunnel && \
+RUN cd /go/src/github.com/ghostunnel/ghostunnel && \
     GO111MODULE=on make clean ghostunnel && \
     cp ghostunnel /usr/bin/ghostunnel
 
diff --git a/Dockerfile-test b/Dockerfile-test
index 73a903e9f58..b153f076352 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -1,25 +1,23 @@
 # Dockerfile for running integration tests, includes PKCS11/SoftHSM setup. 
 # 
 # Build image:
-#     docker build --build-arg GO_VERSION=[VERSION] -t squareup/ghostunnel-test -f Dockerfile-test .
+#     docker build --build-arg GO_VERSION=[VERSION] -t ghostunnel/ghostunnel-test -f Dockerfile-test .
 #
 # Run integration tests:
-#     docker run -v /dev/log:/dev/log -v $PWD:/go/src/github.com/square/ghostunnel squareup/ghostunnel-test
+#     docker run -v /dev/log:/dev/log -v $PWD:/go/src/github.com/ghostunnel/ghostunnel ghostunnel/ghostunnel-test
 
 ARG GO_VERSION
 
 FROM golang:${GO_VERSION}
 
-MAINTAINER Cedric Staub "cs@squareup.com"
-
 # Install build dependencies
 RUN apt-get update && \
     apt-get install -y build-essential python3-minimal netcat softhsm2 rsyslog git python3-distutils </dev/null && \
-    mkdir -p /etc/softhsm /var/lib/softhsm/tokens /go/src/github.com/square/ghostunnel && \
+    mkdir -p /etc/softhsm /var/lib/softhsm/tokens /go/src/github.com/ghostunnel/ghostunnel && \
     go get github.com/wadey/gocovmerge && \
     go get golang.org/x/tools/cmd/cover
 
-WORKDIR /go/src/github.com/square/ghostunnel
+WORKDIR /go/src/github.com/ghostunnel/ghostunnel
 
 ENV GO111MODULE=on
 
diff --git a/Makefile b/Makefile
index f10f45e0522..f3a06b82ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -55,11 +55,11 @@ softhsm-import:
 
 # Build Docker image
 docker-build:
-	docker build -t squareup/ghostunnel .
+	docker build -t ghostunnel/ghostunnel .
 .PHONY: docker-build
 
 # Run unit and integration tests in Docker container
 docker-test:
-	docker build --build-arg GO_VERSION=${GO_VERSION} -t squareup/ghostunnel-test -f Dockerfile-test .
-	docker run -v ${PWD}:/go/src/github.com/square/ghostunnel squareup/ghostunnel-test
+	docker build --build-arg GO_VERSION=${GO_VERSION} -t ghostunnel/ghostunnel-test -f Dockerfile-test .
+	docker run -v ${PWD}:/go/src/github.com/ghostunnel/ghostunnel ghostunnel/ghostunnel-test
 .PHONY: docker-test
diff --git a/README.md b/README.md
index ac0760771e9..220ea6921d5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Ghostunnel
 ==========
 
-[![license](http://img.shields.io/badge/license-apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/square/ghostunnel/master/LICENSE) [![release](https://img.shields.io/github/release/square/ghostunnel.svg?style=flat)](https://github.com/square/ghostunnel/releases) [![docker](https://img.shields.io/badge/docker-hub-blue.svg?style=flat)](https://hub.docker.com/r/squareup/ghostunnel) [![travis](https://img.shields.io/travis/square/ghostunnel/master.svg?maxAge=3600&logo=travis&label=travis)](https://travis-ci.org/square/ghostunnel) [![appveyor](https://img.shields.io/appveyor/ci/csstaub/ghostunnel-58e7k.svg?maxAge=3600&logo=appveyor&label=appveyor)](https://ci.appveyor.com/project/csstaub/ghostunnel-58e7k) [![coverage](https://coveralls.io/repos/github/square/ghostunnel/badge.svg?branch=master)](https://coveralls.io/r/square/ghostunnel) [![report](https://goreportcard.com/badge/github.com/square/ghostunnel)](https://goreportcard.com/report/github.com/square/ghostunnel)
+[![license](http://img.shields.io/badge/license-apache_2.0-blue.svg?style=flat)](https://raw.githubusercontent.com/square/ghostunnel/master/LICENSE) [![release](https://img.shields.io/github/release/square/ghostunnel.svg?style=flat)](https://github.com/ghostunnel/ghostunnel/releases) [![docker](https://img.shields.io/badge/docker-hub-blue.svg?style=flat)](https://hub.docker.com/r/ghostunnel/ghostunnel) [![travis](https://img.shields.io/travis/square/ghostunnel/master.svg?maxAge=3600&logo=travis&label=travis)](https://travis-ci.org/square/ghostunnel) [![appveyor](https://img.shields.io/appveyor/ci/csstaub/ghostunnel-58e7k.svg?maxAge=3600&logo=appveyor&label=appveyor)](https://ci.appveyor.com/project/csstaub/ghostunnel-58e7k) [![coverage](https://coveralls.io/repos/github/square/ghostunnel/badge.svg?branch=master)](https://coveralls.io/r/square/ghostunnel) [![report](https://goreportcard.com/badge/github.com/ghostunnel/ghostunnel)](https://goreportcard.com/report/github.com/ghostunnel/ghostunnel)
 
 👻
 
@@ -59,7 +59,7 @@ Getting Started
 To get started and play around with the implementation, you will need to
 generate some test certificates. If you want to bootstrap a full PKI, one
 good way to get started is to use a package like
-[square/certstrap](https://github.com/square/certstrap). If you only need
+[square/certstrap](https://github.com/ghostunnel/certstrap). If you only need
 some test certificates for playing around with the tunnel, you can find
 some pre-generated ones in the `test-keys` directory (alongside instructions
 on how to generate new ones with OpenSSL).
@@ -80,8 +80,8 @@ Note that ghostunnel requires Go 1.12 or later to build, and CGO is required for
 PKCS#11 support.  See also [CROSS-COMPILE](docs/CROSS-COMPILE.md) for
 instructions on how to cross-compile a custom build with CGO enabled.
 
-[rel]: https://github.com/square/ghostunnel/releases
-[hub]: https://hub.docker.com/r/squareup/ghostunnel
+[rel]: https://github.com/ghostunnel/ghostunnel/releases
+[hub]: https://hub.docker.com/r/ghostunnel/ghostunnel
 [xgo]: https://github.com/karalabe/xgo
 
 ### Develop
diff --git a/auth/auth.go b/auth/auth.go
index 8bcbaf186fd..7fcfb99a5d0 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -22,7 +22,7 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/square/ghostunnel/wildcard"
+	"github.com/ghostunnel/ghostunnel/wildcard"
 )
 
 // Logger is used by this package to log messages
diff --git a/auth/auth_test.go b/auth/auth_test.go
index 8cc8cb9eb43..e0561539cdf 100644
--- a/auth/auth_test.go
+++ b/auth/auth_test.go
@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/square/ghostunnel/wildcard"
+	"github.com/ghostunnel/ghostunnel/wildcard"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/doc.go b/doc.go
index fc834aded68..e31b06fa74f 100644
--- a/doc.go
+++ b/doc.go
@@ -58,7 +58,7 @@ a TLS-secured service.
 
 For a more in-depth explanation, please see the README.md file (and docs
 folder) that shipped with ghostunnel or view the latest docs on
-github.com/square/ghostunnel.
+github.com/ghostunnel/ghostunnel.
 .SH "CERTIFICATES & PRIVATE KEYS"
 Ghostunnel accepts certificates in multiple different file formats.
 
diff --git a/docs/ACCESS-FLAGS.md b/docs/ACCESS-FLAGS.md
index ebf35f467b3..70734c6e38d 100644
--- a/docs/ACCESS-FLAGS.md
+++ b/docs/ACCESS-FLAGS.md
@@ -110,7 +110,7 @@ with `spiffe://ghostunnel/server1` or `spiffe://ghostunnel/server2` URI SANs (as
 well as other values). See documentation for the [wildcard][wildcard] package
 for more information.
 
-[wildcard]: https://godoc.org/github.com/square/ghostunnel/wildcard
+[wildcard]: https://godoc.org/github.com/ghostunnel/ghostunnel/wildcard
 
 * `--disable-authentication`
 
@@ -119,4 +119,4 @@ This is useful if you just want to use Ghostunnel to wrap a connection in TLS
 but the backend doesn't require mutual authentication.
 
 [tls]: https://golang.org/pkg/crypto/tls
-[wildcard]: https://godoc.org/github.com/square/ghostunnel/wildcard
+[wildcard]: https://godoc.org/github.com/ghostunnel/ghostunnel/wildcard
diff --git a/docs/CROSS-COMPILE.md b/docs/CROSS-COMPILE.md
index 591b09cdd08..b48402c66a5 100644
--- a/docs/CROSS-COMPILE.md
+++ b/docs/CROSS-COMPILE.md
@@ -17,7 +17,7 @@ For example, to build a static 64-bit Windows binary:
       -branch master \
       -targets 'windows/amd64' \
       -ldflags '-w -extldflags "-static" -extld x86_64-w64-mingw32-gcc' \
-      github.com/square/ghostunnel
+      github.com/ghostunnel/ghostunnel
 
 Ghostunnel ships with a `Makefile.dist` that will cross-compile for
 darwin/amd64, linux/amd64, windows/386 and windows/amd64 when asked to build
diff --git a/docs/spiffe-workload-api-demo/README.md b/docs/spiffe-workload-api-demo/README.md
index 7879037e61b..b9921f431bb 100644
--- a/docs/spiffe-workload-api-demo/README.md
+++ b/docs/spiffe-workload-api-demo/README.md
@@ -6,7 +6,7 @@ communication between a frontend and backend service.
 
 ## Prerequisites
 
-* `ghostunnel` binary from [Ghostunnel](https://github.com/square/ghostunnel/releases/latest)
+* `ghostunnel` binary from [Ghostunnel](https://github.com/ghostunnel/ghostunnel/releases/latest)
 * `spire-server` and `spire-agent` binaries from [SPIRE](https://github.com/spiffe/spire/releases/latest)
 * `socat`
 
diff --git a/go.mod b/go.mod
index f6372ba4571..791a3867971 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/square/ghostunnel
+module github.com/ghostunnel/ghostunnel
 
 require (
 	github.com/Masterminds/goutils v1.1.0 // indirect
diff --git a/main.go b/main.go
index 66094722b79..c3465b1cde7 100644
--- a/main.go
+++ b/main.go
@@ -31,15 +31,15 @@ import (
 	"time"
 
 	graphite "github.com/cyberdelia/go-metrics-graphite"
+	"github.com/ghostunnel/ghostunnel/auth"
+	"github.com/ghostunnel/ghostunnel/certloader"
+	"github.com/ghostunnel/ghostunnel/proxy"
+	"github.com/ghostunnel/ghostunnel/socket"
+	"github.com/ghostunnel/ghostunnel/wildcard"
 	gsyslog "github.com/hashicorp/go-syslog"
 	http_dialer "github.com/mwitkow/go-http-dialer"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	metrics "github.com/rcrowley/go-metrics"
-	"github.com/square/ghostunnel/auth"
-	"github.com/square/ghostunnel/certloader"
-	"github.com/square/ghostunnel/proxy"
-	"github.com/square/ghostunnel/socket"
-	"github.com/square/ghostunnel/wildcard"
 	sqmetrics "github.com/square/go-sq-metrics"
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 
diff --git a/main_test.go b/main_test.go
index e892844c8fc..3251a8a91bd 100644
--- a/main_test.go
+++ b/main_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/square/ghostunnel/proxy"
+	"github.com/ghostunnel/ghostunnel/proxy"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/signals.go b/signals.go
index 1f23726e7a0..9bcef4e6c2f 100644
--- a/signals.go
+++ b/signals.go
@@ -22,7 +22,7 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/square/ghostunnel/proxy"
+	"github.com/ghostunnel/ghostunnel/proxy"
 )
 
 // isShutdownSignal checks if the received signal is a shutdown signal
diff --git a/tls.go b/tls.go
index 625ec6f4eed..5ce92eef86b 100644
--- a/tls.go
+++ b/tls.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/square/ghostunnel/certloader"
+	"github.com/ghostunnel/ghostunnel/certloader"
 )
 
 // Unsafe cipher suites available for compatibility reasons. To unlock these