From 384f965b3b06d258ef1f670a225f873e75b7ad02 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Sat, 8 Feb 2025 12:04:30 -0600
Subject: [PATCH] bert: Refactor stjohnscccc.org config

---
 bert/services/http/stjohnscccc.org.nix | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/bert/services/http/stjohnscccc.org.nix b/bert/services/http/stjohnscccc.org.nix
index b5dce54..c76faf8 100644
--- a/bert/services/http/stjohnscccc.org.nix
+++ b/bert/services/http/stjohnscccc.org.nix
@@ -1,11 +1,6 @@
-{ pkgs, lib, config, ... }:
-let
-  app = "stjohnscccc";
-  domain = "${app}.chandlerswift.com"; # TODO
-  dataDir = "/srv/www/stjohnscccc.org";
-in {
-  services.phpfpm.pools.${app} = {
-    user = app;
+{ pkgs, lib, config, ... }: {
+  services.phpfpm.pools.stjohnscccc = {
+    user = "stjohnscccc";
     settings = {
       "listen.owner" = config.services.caddy.user;
       "pm" = "dynamic";
@@ -20,8 +15,8 @@ in {
     };
     # phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
   };
-  services.caddy.virtualHosts.${domain}.extraConfig = ''
-    root * ${dataDir}/public
+  services.caddy.virtualHosts."stjohnscccc.org".extraConfig = ''
+    root * /srv/www/stjohnscccc.org/public
 
     redir /downloads /downloads/
 
@@ -34,7 +29,7 @@ in {
 
     handle {
       encode zstd gzip
-      php_fastcgi unix/${config.services.phpfpm.pools.${app}.socket}
+      php_fastcgi unix/${config.services.phpfpm.pools.stjohnscccc.socket}
       file_server
     }
 
@@ -42,12 +37,12 @@ in {
       respond "{err.status_code} {err.status_text}"
     }
   '';
-  users.users.${app} = {
+  users.users.stjohnscccc = {
     isSystemUser = true;
-    home = dataDir;
-    group = app;
+    home = "/srv/www/stjohnscccc.org";
+    group = "stjohnscccc";
   };
-  users.groups.${app} = {};
+  users.groups.stjohnscccc = {};
   systemd.tmpfiles.settings."10-stjohnscccc.org" = {
     "/srv/www/stjohnscccc.org" = {
       d = {};