From a86e275fdbde49b5530f09915a4f3ec3f6d6a308 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 21 Apr 2024 14:00:47 +0200
Subject: move server code to cmd/server

---
 nix/default.nix | 8 ++++----
 nix/scripts.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nix')

diff --git a/nix/default.nix b/nix/default.nix
index 4299676..32c546f 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -14,7 +14,7 @@ let
         public
       ];
       config = {
-        Cmd = [ "${server}/bin/website" ];
+        Cmd = [ "${server}/bin/server" ];
         Env = [
           "PRODUCTION=true"
           "LISTEN_ADDRESS=::"
@@ -39,7 +39,7 @@ with pkgs; rec {
       fileset = unions [
         ./../go.mod
         ./../go.sum
-        ./../cmd
+        ./../cmd/build
         ./../internal
       ];
     };
@@ -61,7 +61,7 @@ with pkgs; rec {
     ${builder}/bin/build -s $src -d $out/public
   '';
   server = buildGoApplication {
-    pname = "website";
+    pname = "server";
     inherit version;
     CGO_ENABLED = 0;
     src = with lib.fileset; toSource {
@@ -69,7 +69,7 @@ with pkgs; rec {
       fileset = unions [
         ./../go.mod
         ./../go.sum
-        ./../server.go
+        ./../cmd/server
         ./../internal
       ];
     };
diff --git a/nix/scripts.nix b/nix/scripts.nix
index b50ba16..e097648 100644
--- a/nix/scripts.nix
+++ b/nix/scripts.nix
@@ -16,10 +16,10 @@ let
 in
 with pkgs; [
   (writeShellScriptBin "watch-builder" ''
-    ${watchFlake} "direnv exec . watchexec -i server.go -i public -r go run ./cmd/build $@"
+    ${watchFlake} "direnv exec . watchexec -i cmd/server -i public -r go run ./cmd/build $@"
   '')
   (writeShellScriptBin "watch-server" ''
-    ${watchFlake} "direnv exec . watchexec -r go run ./server.go $@"
+    ${watchFlake} "direnv exec . watchexec -r go run ./cmd/server $@"
   '')
   (writeShellScriptBin "check-licenses" ''
     ${go-licenses}/bin/go-licenses check --include_tests ./... --disallowed_types=restricted,forbidden
-- 
cgit 1.4.1