From 2e23a64c2bd36607368e8ae20c51a739f22083e8 Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Thu, 8 Jan 2026 09:40:31 -0600
Subject: merge changes from main

---
 hosts/ganymede/caddy-env.age               | 6 ++++++
 hosts/ganymede/caddy-tailscale-authkey.age | 6 ------
 hosts/ganymede/caddy.nix                   | 9 +++++++++
 hosts/ganymede/config.nix                  | 4 ++--
 secrets.nix                                | 2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 hosts/ganymede/caddy-env.age
 delete mode 100644 hosts/ganymede/caddy-tailscale-authkey.age

diff --git a/hosts/ganymede/caddy-env.age b/hosts/ganymede/caddy-env.age
new file mode 100644
index 0000000..79d7b91
--- /dev/null
+++ b/hosts/ganymede/caddy-env.age
@@ -0,0 +1,6 @@
+age-encryption.org/v1
+-> ssh-ed25519 Jg4yWQ cVxgS8Sy6bB9lQVeDBQVhmCaD437YxPAZduSzFA6WHE
+KV9ZrAEH3z8cT0IeaIfkqMYhU/4LS2St0ySK030Ie1c
+--- pUeKTMwZf3FARqVLl9TARgItjcr1O82hUKaZ9YtjFRM
+�a_v1BRg��ʫ*�������+r֘0�}���ܨ��d`��˟��ϞJ�<�3h�i�1�|�G��jl3
���!���7r	��3X�p=�d��`7����1�ݻѲh<H��d�������y����;�V�˜�N�iGN
�^@`�OnT���y�q��>FW���5/2̞?���[���H��Z� -�	�S�d�:F��C�G��q����%-���#�W~�����Wz�_��X����F���)Z�S��~M�h�CF!C�)N*�ٟ������
+R
\ No newline at end of file
diff --git a/hosts/ganymede/caddy-tailscale-authkey.age b/hosts/ganymede/caddy-tailscale-authkey.age
deleted file mode 100644
index f2a7de6..0000000
--- a/hosts/ganymede/caddy-tailscale-authkey.age
+++ /dev/null
@@ -1,6 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 Jg4yWQ xYq/DjdgQ3LJhg797pf3LA39bU9akYBLd+RoH7RMPm4
-p9CQSoh2511x7c0WAUPut4hWA3k0AI5b2fQEol5Hqs4
---- hkbJJSCnoSYIyHtbtuLKz+fN17anXp31b2MAADIpH/4
-�Ћs�h����Z�
-��NZzvn��B繯�xZ�;q�Y-"��`'�O͜P�`Pi�TBs�WJ�Tv��[?�3����L܌vԻ�������e�h��
\ No newline at end of file
diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index 5ea7c5b..b073f9a 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -12,6 +12,15 @@
       hash = "sha256-BQdm8p9eDGhRu6mKyX2FAUaKoU6Lv2A746Sey39T13I=";
     });
 
+    extraConfig = ''
+      {
+        acme_dns porkbun {
+          api_key {env.PORKBUN_API_KEY}
+          api_secret_key {env.PORKBUN_API_SECRET_KEY}
+        }
+      }
+    '';
+
     virtualHosts."https://web.tail7cca06.ts.net".extraConfig = ''
       bind tailscale/web
       root * /var/www/williams_web
diff --git a/hosts/ganymede/config.nix b/hosts/ganymede/config.nix
index 822a843..50ef29a 100644
--- a/hosts/ganymede/config.nix
+++ b/hosts/ganymede/config.nix
@@ -4,7 +4,7 @@
 
     secrets = {
       "williams-psk".file = ./williams-psk.age;
-      "caddy-tailscale-authkey".file = ./caddy-tailscale-authkey.age;
+      "caddy-env".file = ./caddy-env.age;
     };
 
     terminal = {
@@ -40,7 +40,7 @@
         forgejo.enable = true;
         caddy = {
           enable = true;
-          envFile = config.collinux.secrets."caddy-tailscale-authkey".path;
+          envFile = config.collinux.secrets."caddy-env".path;
         };
       };
     };
diff --git a/secrets.nix b/secrets.nix
index eca8da4..3dc8491 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -4,7 +4,7 @@ let
   jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPB7feUHl5qoD5zF9AMOV2meViA+wZYdVvbVjPkggZf8";
   ganymede = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlr+53UmlGVP1blkdNl6NFqn1w2umFJyjH1EVUPKIy9";
 in {
-  "caddy-tailscale-authkey.age".publicKeys = [ganymede];
+  "caddy-env.age".publicKeys = [ganymede];
   "williams-psk.age".publicKeys = [ganymede];
   "github-ssh-key.age".publicKeys = [mercury jupiter];
 }
-- 
cgit v1.3.1