uuuuh

3 files changed, 25 insertions, 14 deletions

diff --git a/hosts/omega-relay/certs.nix b/hosts/omega-relay/certs.nix
new file mode 100644
index 0000000..affa18e
--- /dev/null
+++ b/hosts/omega-relay/certs.nix
@@ -0,0 +1,18 @@
+{pkgs, config, lib, ...}: 
+  let 
+    names = [
+      "moni.wilkuu.xyz"
+      "matrix.wilkuu.xyz"
+      "rss.wilkuu.xyz" 
+      "bulwark.wilkuu.xyz"
+      "uptime.wilkuu.xyz"
+      "bitwarden.wilkuu.xyz"
+      "wilkuu.xyz"
+    ];
+    in
+{
+  services.nginx.virtualHosts = lib.genAttrs names (name: {
+    enableACME = lib.mkForce false; 
+    useACMEHost = "wilkuu.xyz";
+  }); 
+} 
diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index 27cbf13..181add4 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -10,6 +10,7 @@
     ./disko.nix
     ./vm.nix
     ./hardware-configuration.nix
+    ./certs.nix
     ../../services/mysql.nix
     ../../services/vaultwarden.nix
     ../../services/uptimekuma.nix
@@ -53,7 +54,7 @@
       prometheus.enableExporters = true;
       desecDyn = {
         enable = true;
-        domains."wilkuu.dedyn.io" = {
+        domains."wilkuu.xyz" = {
           doWildcard = true;
           enableDDNS = true;
           enableACME = true;
@@ -174,18 +175,10 @@
           tryFiles = "$uri $uri/ =404";
         };
       };
-      virtualHosts."wilkuu.dedyn.io" = {
-        forceSSL = true;
-        useACMEHost = "wilkuu.dedyn.io";
-        root = "/srv/www/wilkuu.dedyn.io/";
-        locations."/" = {
-          index = "index.html";
-          tryFiles = "$uri $uri/ =404";
-        };
-      };
       virtualHosts."moni.wilkuu.xyz" = {
         forceSSL = true;
-        enableACME = true;
+        enableACME = false;
+        useACMEHost = "wilkuu.xyz";  
         locations."/" = {
           proxyPass = "http://192.168.88.5:3132";
           recommendedProxySettings = true;
diff --git a/hosts/omega-relay/firewall.nix b/hosts/omega-relay/firewall.nix
index c276831..4bbc77a 100644
--- a/hosts/omega-relay/firewall.nix
+++ b/hosts/omega-relay/firewall.nix
@@ -79,10 +79,10 @@ in
             ];
             presharedKeyFile = config.sops.secrets."wg/home/chrono/PSK".path;
             publicKey = "rP5lJY6ea7BKX40edzqNMJbhfLkSlSwG1FipEufeflk=";
-            # endpoint       = "45.138.54.155:16556";
-            endpoint = "wilkuu.duckdns.org:16556";
+            endpoint       = "45.138.54.155:16556";
+            # endpoint = "wilkuu.duckdns.org:16556";
             name = "wg-home-chronosphere";
-
+            persistentKeepalive = 5;
           }
         ];
       };