From e51b20e4ab7dd435bffc466c1043900e60a2e6b6 Mon Sep 17 00:00:00 2001
From: Hadi <112569860+anotherhadi@users.noreply.github.com>
Date: Wed, 19 Jun 2024 23:07:47 +0200
Subject: [PATCH] Update

---
 hosts/modules/server/cloudflare-dyndns.nix | 21 +++++++++++++--------
 hosts/modules/server/nginx.nix             | 11 +++++++++--
 hosts/server/configuration.nix             |  1 +
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/hosts/modules/server/cloudflare-dyndns.nix b/hosts/modules/server/cloudflare-dyndns.nix
index 7bafac5..ba135fd 100644
--- a/hosts/modules/server/cloudflare-dyndns.nix
+++ b/hosts/modules/server/cloudflare-dyndns.nix
@@ -1,10 +1,15 @@
 # CloudFlare Dynamic DNS client
 {
-    services.cloudflare-dyndns = {
-        enable = true;
-        ipv4 = true;
-        domains = [ "cloud.anotherhadi.com" "vault.anotherhadi.com" "try.anotherhadi.com"];
-        proxied = true;
-        apiTokenFile = "/etc/cloudflare/apiToken";
-    };
-}
\ No newline at end of file
+  services.cloudflare-dyndns = {
+    enable = true;
+    ipv4 = true;
+    domains = [
+      "cloud.anotherhadi.com"
+      "vault.anotherhadi.com"
+      "anotherhadi.com"
+      "www.anotherhadi.com"
+    ];
+    proxied = true;
+    apiTokenFile = "/etc/cloudflare/apiToken";
+  };
+}
diff --git a/hosts/modules/server/nginx.nix b/hosts/modules/server/nginx.nix
index f54eb74..ee8fbbf 100644
--- a/hosts/modules/server/nginx.nix
+++ b/hosts/modules/server/nginx.nix
@@ -1,9 +1,16 @@
 # Nginx Reverse Proxy & ACME certs
-{config, ...}:{
+{ config, ... }: {
   services.nginx.enable = true;
   security.acme = {
     acceptTerms = true;
-    defaults.email = ${config.var.git.email};
+    defaults.email = config.var.git.email;
   };
   networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+  # test
+  services.nginx.virtualHosts."anotherhadi.com" = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/".root = "/var/www/";
+  };
 }
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 5c4571f..e09b344 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -6,6 +6,7 @@
     ../modules/server/openssh.nix
     ../modules/server/sops.nix
     ../modules/server/cloudflare-dyndns.nix
+    ../modules/server/nginx.nix
   ];
 
   # Bootloader.