From 5ca7dadd02fb49dd62ad448d12021359e41beec1 Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Tue, 3 Aug 2021 17:47:01 -0600
Subject: full deployment via nix

---
 srv/cmd/mediocre-blog/main.go | 10 ++++++++--
 srv/default.nix               |  2 +-
 srv/pow/pow_test.go           |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'srv')

diff --git a/srv/cmd/mediocre-blog/main.go b/srv/cmd/mediocre-blog/main.go
index f912f45..5233a2c 100644
--- a/srv/cmd/mediocre-blog/main.go
+++ b/srv/cmd/mediocre-blog/main.go
@@ -143,8 +143,8 @@ func main() {
 		Store:          mlStore,
 		Mailer:         mailer,
 		Clock:          clock,
-		FinalizeSubURL: path.Join(publicURL.String(), "/mailinglist/finalize.html"),
-		UnsubURL:       path.Join(publicURL.String(), "/mailinglist/unsubscribe.html"),
+		FinalizeSubURL: publicURL.String() + "/mailinglist/finalize.html",
+		UnsubURL:       publicURL.String() + "/mailinglist/unsubscribe.html",
 	})
 
 	mux := http.NewServeMux()
@@ -183,6 +183,12 @@ func main() {
 		loggerFatalErr(ctx, logger, "creating listen socket", err)
 	}
 
+	if *listenProto == "unix" {
+		if err := os.Chmod(*listenAddr, 0777); err != nil {
+			loggerFatalErr(ctx, logger, "chmod-ing unix socket", err)
+		}
+	}
+
 	srv := &http.Server{Handler: mux}
 	go func() {
 		if err := srv.Serve(l); err != nil && !errors.Is(err, http.ErrServerClosed) {
diff --git a/srv/default.nix b/srv/default.nix
index 5a4a4d0..e4babab 100644
--- a/srv/default.nix
+++ b/srv/default.nix
@@ -9,7 +9,7 @@ in
             pname = "mediocre-blog-srv";
             version = "dev";
             src = ./.;
-            vendorSha256 = "0xr5gks5mrh34s5npncw71wncrzqrhnm3vjfwdakd7fzd6iw049z";
+            vendorSha256 = "08wv94yv2wmlxzmanw551gixc8v8nl6zq2m721ig9nl3r540x46f";
         };
 
         shell = pkgs.stdenv.mkDerivation {
diff --git a/srv/pow/pow_test.go b/srv/pow/pow_test.go
index 4bc4141..cc868b1 100644
--- a/srv/pow/pow_test.go
+++ b/srv/pow/pow_test.go
@@ -114,7 +114,7 @@ func TestManager(t *testing.T) {
 		c := mgr.NewChallenge()
 		solution := Solve(c)
 		clock.Add(2 * time.Second)
-		assert.ErrorIs(t, mgr.CheckSolution(c.Seed, solution), ErrExpiredSolution)
+		assert.ErrorIs(t, mgr.CheckSolution(c.Seed, solution), ErrExpiredSeed)
 	}
 
 }
-- 
cgit v1.2.3