From 3129e49d3043d1d24c82d5be840f207210760cfc Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Sun, 1 Sep 2024 15:53:19 +0200
Subject: [PATCH] feat: add blog

---
 config/basic/users.nix                        |   2 +
 config/services/blog.nix                      |  83 ++++++++++++++++++
 hosts/elisabeth/blog.nix                      |   7 --
 hosts/elisabeth/default.nix                   |   1 -
 hosts/elisabeth/guests.nix                    |   3 +
 hosts/elisabeth/secrets/blog/host.pub         |   1 +
 secrets/secrets.nix.age                       | Bin 5825 -> 5903 bytes
 .../elisabeth/keys/elisabeth-blog.age         |  17 ++++
 .../elisabeth/keys/elisabeth-blog.pub         |   1 +
 .../psks/elisabeth+elisabeth-blog.age         |  15 ++++
 10 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 config/services/blog.nix
 delete mode 100644 hosts/elisabeth/blog.nix
 create mode 100644 hosts/elisabeth/secrets/blog/host.pub
 create mode 100644 secrets/wireguard/elisabeth/keys/elisabeth-blog.age
 create mode 100644 secrets/wireguard/elisabeth/keys/elisabeth-blog.pub
 create mode 100644 secrets/wireguard/elisabeth/psks/elisabeth+elisabeth-blog.age

diff --git a/config/basic/users.nix b/config/basic/users.nix
index 87d1e94..ab5a2f3 100644
--- a/config/basic/users.nix
+++ b/config/basic/users.nix
@@ -47,5 +47,7 @@
       family = uidGid 2003;
       printer = uidGid 2005;
       pr-tracker = uidGid 2006;
+      blog = uidGid 2007;
+      signald = uidGid 2008;
     };
 }
diff --git a/config/services/blog.nix b/config/services/blog.nix
new file mode 100644
index 0000000..9e9125c
--- /dev/null
+++ b/config/services/blog.nix
@@ -0,0 +1,83 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+let
+  prestart = pkgs.writeShellScript "pr-tracker-pre" ''
+    if [ ! -f ./ssh_key ]; then
+      ssh-keygen -t ed25519 -N "" -f ssh_key
+    fi
+    ${lib.getExe pkgs.git} config core.sshCommand 'ssh -i ~/ssh_key'
+    if [ ! -d ./blog ]; then
+      ${lib.getExe pkgs.git} clone ssh://git@forge.lel.lol:9922/patrick/blog.git |\
+      echo "failed to clone the repository did you forget to add the ssh key?"
+    fi
+  '';
+in
+{
+  wireguard.elisabeth = {
+    client.via = "elisabeth";
+    firewallRuleForNode.elisabeth.allowedTCPPorts = [ 3000 ];
+  };
+  services.nginx = {
+    enable = true;
+    user = "blog";
+    virtualHosts."blog.lel.lol" = {
+      root = "/var/lib/blog/blog/public";
+    };
+  };
+  environment.persistence."/persist".directories = [
+    {
+      directory = "/var/lib/blog";
+      user = "blog";
+      group = "blog";
+      mode = "0700";
+    }
+    {
+      directory = "/var/lib/signald";
+      user = "signald";
+      group = "signald";
+      mode = "0700";
+    }
+  ];
+  systemd.timers.blog-update = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "1m";
+      OnUnitActiveSec = "1m";
+    };
+  };
+  users.groups.blog = { };
+  users.users.blog = {
+    isSystemUser = true;
+    group = "blog";
+    home = "/var/lib/blog";
+  };
+
+  systemd.services.blog-update = {
+    script = ''
+      ${lib.getExe pkgs.git} -C blog pull
+      ${lib.getExe pkgs.zola} -r blog/public build
+    '';
+    path = [ pkgs.openssh ];
+    serviceConfig = {
+      Requires = "blog";
+      Type = "oneshot";
+      User = "blog";
+      Group = "blog";
+      StateDirectory = "blog";
+      WorkingDirectory = "/var/lib/blog";
+      LimitNOFILE = "1048576";
+      PrivateTmp = true;
+      PrivateDevices = true;
+      StateDirectoryMode = "0700";
+      ExecStartPre = prestart;
+    };
+  };
+
+  services.signald = {
+    enable = true;
+    group = "blog";
+  };
+}
diff --git a/hosts/elisabeth/blog.nix b/hosts/elisabeth/blog.nix
deleted file mode 100644
index 80ac86a..0000000
--- a/hosts/elisabeth/blog.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  services.nginx.virtualHosts."blog.lel.lol" = {
-    root = "/persist/blog";
-    forceSSL = true;
-    useACMEHost = "web";
-  };
-}
diff --git a/hosts/elisabeth/default.nix b/hosts/elisabeth/default.nix
index ceca0d2..2e7e17e 100644
--- a/hosts/elisabeth/default.nix
+++ b/hosts/elisabeth/default.nix
@@ -19,7 +19,6 @@
 
     ../../config/hardware/physical.nix
 
-    ./blog.nix
     ./net.nix
     ./fs.nix
   ] ++ lib.lists.optionals (!minimal) [ ./guests.nix ];
diff --git a/hosts/elisabeth/guests.nix b/hosts/elisabeth/guests.nix
index 9a7688d..8a8160c 100644
--- a/hosts/elisabeth/guests.nix
+++ b/hosts/elisabeth/guests.nix
@@ -31,6 +31,7 @@ let
         octoprint = "print";
         pr-tracker = "tracker";
         invidious = "yt";
+        blog = "blog";
       };
     in
     "${domains.${hostName}}.${config.secrets.secrets.global.domains.web}";
@@ -183,6 +184,7 @@ in
       (proxyProtect "ttrss" { port = 80; } true)
       (proxyProtect "invidious" { } true)
       (blockOf "yourspotify" { port = 80; })
+      (blockOf "blog" { port = 80; })
       #(blockOf "homebox" {})
       (blockOf "pr-tracker" { })
       {
@@ -317,6 +319,7 @@ in
     // mkContainer "firefly" { }
     // mkContainer "yourspotify" { }
     // mkContainer "netbird" { }
+    // mkContainer "blog" { }
     // mkContainer "kanidm" { }
     // mkContainer "nextcloud" { enablePanzer = true; }
     // mkContainer "paperless" { enableSharedPaperless = true; }
diff --git a/hosts/elisabeth/secrets/blog/host.pub b/hosts/elisabeth/secrets/blog/host.pub
new file mode 100644
index 0000000..c2b7b5b
--- /dev/null
+++ b/hosts/elisabeth/secrets/blog/host.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBBnyvnrDWPq468Zijt46VTUUGWz3QDgj7h6wJ42IAV6
diff --git a/secrets/secrets.nix.age b/secrets/secrets.nix.age
index 834e33e4f298820fbc44ba5a96e8ae8547287c1a..2837910cd053f8c1edc77dfd304af34c95e32d44 100644
GIT binary patch
delta 5890
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
Yw-mCDfgH9xA}$7WQf$Lijea0CXDzMrssI20

delta 5812
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

diff --git a/secrets/wireguard/elisabeth/keys/elisabeth-blog.age b/secrets/wireguard/elisabeth/keys/elisabeth-blog.age
new file mode 100644
index 0000000..4b9d5c6
--- /dev/null
+++ b/secrets/wireguard/elisabeth/keys/elisabeth-blog.age
@@ -0,0 +1,17 @@
+age-encryption.org/v1
+-> X25519 eVtVzXtvsEgbNOdIy4VDn1FbpMAoSZ89cHEoFF+zDls
+0naCdMLWG6MRREA/+OC+xbjxDnPXXfcwdvhGY9bmF3I
+-> piv-p256 ZFgiIw A0b4W+z9JJLdoeLsceIWTgfq9AGhGCYzghM8A/xxi73q
+9z6A/Xk39YcMlY6vflm/HEvMjjrfC8hcp9SVIZ601Xs
+-> piv-p256 XTQkUA As6ZR0tijPVbIGJJQE7ebHDJVuMdvEF7uSecCAFZBr8q
+f6KhqssOYi6Lm7xpNaQEtHKZ6qyd3/lRLDI7Id0+1I8
+-> piv-p256 ZFgiIw AuJ8buC0fCg9gT9DpLSAfVFpYue6nKwq1Q4RLZU0eIfy
++UP/GGc/qW8wznHYVsW7xFuK4/pLgvesoODaafsZDhs
+-> piv-p256 5vmPtQ AyrqpWUElWE9Ai+DeV1lUq+nHAqaZFZkMTPPIu0DiesF
+S5T0MFAArqnNXtwrYGzAi5rK+BkWn/Gs8U6vtqijIwc
+-> 0Skk=zN=-grease E: ]pN}4
+zV/hyZHiaSckbVGuS+oNFItTxcLKTyL8G4G+Btzcym1Afm0CCrXL5fc/ss7tQ7Mx
+ac7JEfvv9cCnAezvog
+--- rvFVqJgSmwEk/Qy4x/LoIlAuJ6JtWxFvInGyO7lv96k
+4��N�ࣅ
+/�Lҩ�C�I*�˨�2����.!����.�1�	������a�
@��3�T�9��)]t�mI�-&5t
\ No newline at end of file
diff --git a/secrets/wireguard/elisabeth/keys/elisabeth-blog.pub b/secrets/wireguard/elisabeth/keys/elisabeth-blog.pub
new file mode 100644
index 0000000..229d1e9
--- /dev/null
+++ b/secrets/wireguard/elisabeth/keys/elisabeth-blog.pub
@@ -0,0 +1 @@
+DVpnYaoXKKk37IbTyG08bTWogBAD9N/s2PVodeHFaXo=
diff --git a/secrets/wireguard/elisabeth/psks/elisabeth+elisabeth-blog.age b/secrets/wireguard/elisabeth/psks/elisabeth+elisabeth-blog.age
new file mode 100644
index 0000000..432c0eb
--- /dev/null
+++ b/secrets/wireguard/elisabeth/psks/elisabeth+elisabeth-blog.age
@@ -0,0 +1,15 @@
+age-encryption.org/v1
+-> X25519 8xUsd8+0vzcdMZ+9/Q7c4uHrINfL/YnGb2oi5TPPUwk
+GrQDEqwQpunmU/Fwa0o2YV1VEMwb7F3uuUqPC2b9kNg
+-> piv-p256 ZFgiIw AtzJHfEspGUDVtaXot1EE/u3Z5cTVL+PeBN2f5ZWbL6M
+fOV0Hp6+cZB3NbypVXQtPULDonweA/62/G5gnunWVG4
+-> piv-p256 XTQkUA AmPo/XlWsLPW+JYoTGCLTxWccJuh4EcKafN+D+URuGoF
+3rHV1yeANXzWRpWb/0EA1IjCOitoTsLGN4dU1raTr0k
+-> piv-p256 ZFgiIw AuduWmro6APJsPTCZrtRpkwECkOfsDL109rvrE9UxkkV
+cnJb8UKLM1Oy9nZr+HQp3p6OhT/+9Htc3GoAqADa2nI
+-> piv-p256 5vmPtQ A3ge8G2tligkbgdXvrngnObz6/kk3R5HN1Gl31Diz5hc
+1d0ebykK0ccq7R4UegjAL+dl0EX6dves6Qsg4n7I0sA
+-> :/-grease 4$+ P= _VV%:"P|
+4Ny9m7mh1lEg
+--- CsASon+mZ54A0BLZmBl9NaSa9n6M9mYbpY6igzdGF+U
+�]lS"q�v�����P2��b���]����
n�7�ϥC@dD-y+�=�ǐ�Y��D�`v	��p
��~�����
\ No newline at end of file