Add postgres and synapse

5 files changed, 39 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index 7c51186..aa30222 100755
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,28 @@
         specialArgs = {
           inherit home-manager;
         };
+      };
+      Spacebar-synapse = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./host/Spacebar-synapse/configuration.nix
+          ./hardware-configuration.nix
+          home-manager.nixosModules.home-manager
+        ];
+        specialArgs = {
+          inherit home-manager;
+        };
+      };
+      Spacebar-postgres = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./host/Spacebar-postgres/configuration.nix
+          ./hardware-configuration.nix
+          home-manager.nixosModules.home-manager
+        ];
+        specialArgs = {
+          inherit home-manager;
+        };
       };     
     };
   };
diff --git a/host/Spacebar-nginx/configuration.nix b/host/Spacebar-nginx/configuration.nix
index 19b8dc0..21da3b4 100755
--- a/host/Spacebar-nginx/configuration.nix
+++ b/host/Spacebar-nginx/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports =
     [
-      ../../modules/base-server.nix
+      ../../modules/base.nix
     ];
 
   networking = {
diff --git a/host/Spacebar-nginx/hosts/spacebar.chat/mail.nix b/host/Spacebar-nginx/hosts/spacebar.chat/mail.nix
new file mode 100755
index 0000000..3ca873d
--- /dev/null
+++ b/host/Spacebar-nginx/hosts/spacebar.chat/mail.nix
@@ -0,0 +1,14 @@
+{
+  enableACME = true;
+  forceSSL = true;
+  locations = {
+    "/" = {
+      proxyPass = "http://192.168.1.3";
+      proxyWebsockets = true;
+      extraConfig =
+        "proxy_ssl_server_name on;" +
+        "proxy_pass_header Authorization;"
+        ;
+    };
+  };
+}
diff --git a/host/Spacebar-nginx/hosts/spacebar.chat/root.nix b/host/Spacebar-nginx/hosts/spacebar.chat/root.nix
deleted file mode 100755
index a859950..0000000
--- a/host/Spacebar-nginx/hosts/spacebar.chat/root.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  root = "/data/nginx/html_boorunav";
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-postgres/configuration.nix b/host/Spacebar-postgres/configuration.nix
index 33e4f6b..b40fd3a 100755
--- a/host/Rory-postgres/configuration.nix
+++ b/host/Spacebar-postgres/configuration.nix
@@ -9,11 +9,11 @@
   networking = {
     hostName = "Spacebar-postgres";
     interfaces.ens18.ipv4.addresses = [ { 
-      address = "192.168.1.3";
+      address = "192.168.1.4";
       prefixLength = 24;
     } ];
     interfaces.ens19.ipv4.addresses = [ {
-      address = "10.10.11.3";
+      address = "10.10.11.4";
       prefixLength = 16;
     } ];
   };