1 files changed, 48 insertions, 44 deletions

diff --git a/flake.nix b/flake.nix
index 36b6b3b..1a2e909 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Cybertrike.org";
+  description = "Cybertrike.com";
 
   inputs = {
     nixinate.url = "github:matthewcroughan/nixinate";
@@ -13,6 +13,7 @@
     let
       pkgs = nixpkgs.legacyPackages.x86_64-linux;
       webroot = "${self}/webroot";
+      fqdn = "crashoverburn.com";
     in
     {
       formatter.x86_64-linux = pkgs.nixpkgs-fmt;
@@ -54,53 +55,56 @@
             tmux attach-session -t $session'';
         };
       nixosConfigurations = {
-        crash-over-burn-1 = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            simple-nixos-mailserver.nixosModule
-            {
-              mailserver = {
-                fqdn = "mail.crashoverburn.com";
-                domains = [ "mail.crashoverburn.com" "crashoverburn.com" ];
-                enable = true;
-                # A list of all login accounts. To create the password hashes, use
-                # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
-                loginAccounts = {
-                  "crash@crashoverburn.com" = {
-                    hashedPasswordFile = "${self}/password.file";
-                    aliases = [ "postmaster@mail.cybertrike.org" "overburn@cybertrike.org"];
+        crash-over-burn-1 =
+          nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              simple-nixos-mailserver.nixosModule
+              {
+                mailserver = {
+                  fqdn = "mail.crashoverburn.com";
+                  domains = [ "mail.crashoverburn.com" "crashoverburn.com" ];
+                  enable = true;
+                  # A list of all login accounts. To create the password hashes, use
+                  # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
+                  loginAccounts = {
+                    "crash@crashoverburn.com" = {
+                      hashedPasswordFile = "${self}/password.file";
+                      aliases = [ "postmaster@mail.crashoverburn.com" "overburn@crashoverburn.com" ];
+                    };
                   };
+                  certificateScheme = "acme-nginx";
                 };
-                certificateScheme = "acme-nginx";
-              };
-            }
-            agenix.nixosModules.default
-            ./openstack.nix
-            (import ./website.nix { inherit webroot; })
-            ./commander.nix
-            {
+              }
+              agenix.nixosModules.default
+              ./openstack.nix
+              (import ./website.nix { inherit webroot; })
+              (import ./ejabberd.nix { inherit fqdn; })
+              ./commander.nix
+              {
+                networking.hostName = "crashoverburn";
                 security.acme = {
-                    acceptTerms = true;
-                    defaults.email = "security@mail.cybertrike.org";
+                  acceptTerms = true;
+                  defaults.email = "postmaster@mail.crashoverburn.com";
                 };
-              environment.systemPackages = [
-                pkgs.btop
-                pkgs.tmux
-                pkgs.neovim
-              ];
-              imports = [
-                "${nixpkgs}/nixos/modules/virtualisation/openstack-config.nix"
-              ];
-              _module.args.nixinate = {
-                host = "193.16.42.36";
-                sshUser = "commander";
-                substituteOnTarget = true;
-                hermetic = true;
-                buildOn = "local";
-              };
-            }
-          ];
-        };
+                environment.systemPackages = [
+                  pkgs.btop
+                  pkgs.tmux
+                  pkgs.neovim
+                ];
+                imports = [
+                  "${nixpkgs}/nixos/modules/virtualisation/openstack-config.nix"
+                ];
+                _module.args.nixinate = {
+                  host = "193.16.42.36";
+                  sshUser = "commander";
+                  substituteOnTarget = true;
+                  hermetic = true;
+                  buildOn = "local";
+                };
+              }
+            ];
+          };
       };
     };
 }