diff options
| author | Christine Dodrill <me@christine.website> | 2019-04-05 02:53:44 +0000 |
|---|---|---|
| committer | Christine Dodrill <me@christine.website> | 2019-04-05 02:53:44 +0000 |
| commit | cedc40aee04bb8c4323096c44ff3c7b3157f9990 (patch) | |
| tree | 2f7777a791608ed03f2f945e7c44ffb21bcc4745 | |
| parent | b08b31ee28f017b01718808340d9217f6c11914b (diff) | |
| download | x-cedc40aee04bb8c4323096c44ff3c7b3157f9990.tar.xz x-cedc40aee04bb8c4323096c44ff3c7b3157f9990.zip | |
greedo -> kahless
| -rw-r--r-- | cmd/johaus/build.go | 4 | ||||
| -rw-r--r-- | cmd/within.website/build.go | 4 | ||||
| -rw-r--r-- | idp/build.go | 6 | ||||
| -rw-r--r-- | internal/greedo/doc.go | 2 | ||||
| -rw-r--r-- | internal/kahless/doc.go | 2 | ||||
| -rw-r--r-- | internal/kahless/kahless.go (renamed from internal/greedo/greedo.go) | 6 | ||||
| -rw-r--r-- | internal/kahless/kahless_test.go (renamed from internal/greedo/greedo_test.go) | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/cmd/johaus/build.go b/cmd/johaus/build.go index 07e8489..34e09c0 100644 --- a/cmd/johaus/build.go +++ b/cmd/johaus/build.go @@ -8,7 +8,7 @@ import ( "log" "os" - "github.com/Xe/x/internal/greedo" + "github.com/Xe/x/internal/kahless" "github.com/Xe/x/internal/minipaas" "github.com/Xe/x/internal/yeet" ) @@ -27,7 +27,7 @@ func main() { defer fin.Close() fname := "johaus-" + yeet.DateTag + ".tar.gz" - pubURL, err := greedo.CopyFile(fname, fin) + pubURL, err := kahless.CopyFile(fname, fin) if err != nil { log.Fatal(err) } diff --git a/cmd/within.website/build.go b/cmd/within.website/build.go index d72d9f5..40ab861 100644 --- a/cmd/within.website/build.go +++ b/cmd/within.website/build.go @@ -8,7 +8,7 @@ import ( "log" "os" - "github.com/Xe/x/internal/greedo" + "github.com/Xe/x/internal/kahless" "github.com/Xe/x/internal/minipaas" "github.com/Xe/x/internal/yeet" ) @@ -27,7 +27,7 @@ func main() { defer fin.Close() fname := "within.website-" + yeet.DateTag + ".tar.gz" - pubURL, err := greedo.CopyFile(fname, fin) + pubURL, err := kahless.CopyFile(fname, fin) if err != nil { log.Fatal(err) } diff --git a/idp/build.go b/idp/build.go index 9d9d01d..7c8e1a2 100644 --- a/idp/build.go +++ b/idp/build.go @@ -8,7 +8,7 @@ import ( "log" "os" - "github.com/Xe/x/internal/greedo" + "github.com/Xe/x/internal/kahless" "github.com/Xe/x/internal/minipaas" "github.com/Xe/x/internal/yeet" ) @@ -18,7 +18,7 @@ func main() { defer cancel() env := append(os.Environ(), []string{"CGO_ENABLED=0", "GOOS=linux"}...) - yeet.ShouldWork(ctx, env, yeet.WD, "vgo", "build", "-o=web") + yeet.ShouldWork(ctx, env, yeet.WD, "go", "build", "-o=web") yeet.ShouldWork(ctx, env, yeet.WD, "appsluggr", "-web=web") fin, err := os.Open("slug.tar.gz") if err != nil { @@ -27,7 +27,7 @@ func main() { defer fin.Close() fname := "idp-" + yeet.DateTag + ".tar.gz" - pubURL, err := greedo.CopyFile(fname, fin) + pubURL, err := kahless.CopyFile(fname, fin) if err != nil { log.Fatal(err) } diff --git a/internal/greedo/doc.go b/internal/greedo/doc.go deleted file mode 100644 index 5684040..0000000 --- a/internal/greedo/doc.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package greedo is a set of functions to copy files to https://xena.greedo.xeserv.us/files. -package greedo diff --git a/internal/kahless/doc.go b/internal/kahless/doc.go new file mode 100644 index 0000000..1fa1134 --- /dev/null +++ b/internal/kahless/doc.go @@ -0,0 +1,2 @@ +// Package kahless is a set of functions to copy files to https://xena.greedo.xeserv.us/files. +package kahless diff --git a/internal/greedo/greedo.go b/internal/kahless/kahless.go index 75e1a3e..7fc8b0c 100644 --- a/internal/greedo/greedo.go +++ b/internal/kahless/kahless.go @@ -1,4 +1,4 @@ -package greedo +package kahless import ( "bytes" @@ -19,7 +19,7 @@ func getAgent() (agent.Agent, error) { } const ( - greedoAddr = `greedo.xeserv.us:22` + greedoAddr = `kahless.wg.akua:22` greedoUser = `xena` ) @@ -81,5 +81,5 @@ func CopyFile(fileName string, contents io.Reader) (string, error) { // WebURL constructs a public-facing URL for a given resource by fragment. func WebURL(fragment string) string { - return "https://xena.greedo.xeserv.us/files/" + fragment + return "https://xena.greedo.xeserv.us/files/slugs/" + fragment } diff --git a/internal/greedo/greedo_test.go b/internal/kahless/kahless_test.go index 4e1f857..ecd675b 100644 --- a/internal/greedo/greedo_test.go +++ b/internal/kahless/kahless_test.go @@ -1,4 +1,4 @@ -package greedo +package kahless import "testing" |
