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

---
 hosts/modules/server/nextcloud.nix | 18 ++++++++----------
 hosts/modules/server/nginx.nix     |  3 ++-
 hosts/modules/server/sops.nix      |  9 ++++-----
 hosts/server/configuration.nix     |  1 +
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/hosts/modules/server/nextcloud.nix b/hosts/modules/server/nextcloud.nix
index b0522f4..a4d831e 100644
--- a/hosts/modules/server/nextcloud.nix
+++ b/hosts/modules/server/nextcloud.nix
@@ -1,24 +1,22 @@
 # Nextcloud
-{ pkgs, ... }:
-let
-    hostname = "cloud.anotherhadi.com";
-in
-{
+let hostname = "cloud.anotherhadi.com";
+in {
   services.nextcloud = {
     enable = true;
     hostName = hostname;
     https = true;
     config = {
-        adminUser = "jack";
-        adminpassFile = "/etc/nextcloud/adminpassFile";
+      adminUser = "jack";
+      adminpassFile = "/etc/nextcloud/adminpassFile";
     };
     settings = {
-        trusted_domains = [ "localhost" "127.0.0.1" "192.168.2.23" "cloud.anotherhadi.com" ];
+      trusted_domains =
+        [ "localhost" "127.0.0.1" "192.168.2.23" "cloud.anotherhadi.com" ];
     };
     nginx.recommendedHttpHeaders = true;
   };
   services.nginx.virtualHosts.${hostname} = {
     forceSSL = true;
     enableACME = true;
-  }
-}
\ No newline at end of file
+  };
+}
diff --git a/hosts/modules/server/nginx.nix b/hosts/modules/server/nginx.nix
index 15896e3..cfdff0e 100644
--- a/hosts/modules/server/nginx.nix
+++ b/hosts/modules/server/nginx.nix
@@ -9,6 +9,7 @@
 
   # test
   services.nginx.virtualHosts."anotherhadi.com" = {
-    locations."/".root = "/var/www/default";
+    serverAliases = [ "www.anotherhadi.com" ];
+    root = "/var/www/default";
   };
 }
diff --git a/hosts/modules/server/sops.nix b/hosts/modules/server/sops.nix
index fd01682..7e75ae1 100644
--- a/hosts/modules/server/sops.nix
+++ b/hosts/modules/server/sops.nix
@@ -13,11 +13,10 @@
         path = "/home/hadi/.ssh/github";
         owner = "hadi";
       };
-      # nextcloud-adminpass = {
-      #   path = "/etc/nextcloud/adminpassFile";
-      #   owner = "nextcloud";
-      #   group = "nextcloud";
-      # };
+      nextcloud-adminpass = {
+        mode = "0444"; # FIXME
+        path = "/etc/nextcloud/adminpassFile";
+      };
       cloudflare-apitoken = {
         mode = "0444"; # FIXME
         path = "/etc/cloudflare/apiToken";
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index e09b344..5c6570f 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -7,6 +7,7 @@
     ../modules/server/sops.nix
     ../modules/server/cloudflare-dyndns.nix
     ../modules/server/nginx.nix
+    ../modules/server/nextcloud.nix
   ];
 
   # Bootloader.