From 1249cbcc8561379c1998e513552012cd8a5e908a Mon Sep 17 00:00:00 2001
From: Cara Salter <cara@devcara.com>
Date: Wed, 6 Apr 2022 12:30:52 -0400
Subject: ports

---
 flake.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index c9fe673..5f3526d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,6 +75,9 @@
             };
 
             config = lib.mkIf config.cara.services.carasite.enable {
+              users.groups.cara-site = {
+                members = [ "cara-site" ];
+              };
               users.users.cara-site = {
                 createHome = true;
                 isSystemUser = true;
@@ -85,19 +88,14 @@
               systemd.services.cara-site = {
                 wantedBy = [ "multi-user.target" ];
                 environment = {
-                  PORT = "${config.cara.services.carasite.port}";
+                  PORT = "${toString (config.cara.services.carasite.port)}";
                 };
                 serviceConfig = { 
                   User = "cara-site";
                   Group = "cara-site";
                   Restart = "always";
-                  WorkingDirectory = "/var/lib/cara-site";
-                  script = let site = defaultPackage;
-                  in ''
-                    export PORT=${config.cara.services.carasite.port}
-                    cd ${site}
-                    exec ${site/bin/xesite}
-                  '';
+                  WorkingDirectory = "${defaultPackage}";
+                  ExecStart = "${defaultPackage}/bin/carasite";
                 };
               };
 
@@ -110,7 +108,7 @@
                   enableACME = true;
 
                   locations."/" = {
-                    proxyPass = "http://127.0.0.1:${config.cara.services.carasite.port}";
+                    proxyPass = "http://127.0.0.1:${toString (config.cara.services.carasite.port)}";
                   };
                 };
               };
-- 
cgit v1.2.3