working configuration

2 files changed, 2 insertions, 22 deletions

diff --git a/ejabberd.nix b/ejabberd.nix
index 4a19440..f18cfe6 100644
--- a/ejabberd.nix
+++ b/ejabberd.nix
@@ -22,7 +22,7 @@ in {
       s2s_cafile = "/etc/ssl/certs/ca-certificates.crt";
       ca_file = "/etc/ssl/certs/ca-certificates.crt";
       certfiles = [ "${certDirectory}/*.pem" ];
-      listen = map (x: x // { ip = "10.25.1.3"; }) [
+      listen = map (x: x // { ip = "10.0.1.30"; }) [
         {
           inherit dhfile;
           port = 5222;
@@ -218,7 +218,7 @@ in {
     };
   };
   security.acme.certs.${fqdn} = {
-    extraDomainNames = map (x: "${x}.xmpp.${fqdn}") [
+    extraDomainNames = map (x: "${x}.${fqdn}") [
       "pubsub"
       "proxy"
       "upload"
diff --git a/website.nix b/website.nix
index 1936574..d36f538 100644
--- a/website.nix
+++ b/website.nix
@@ -1,31 +1,11 @@
 { webroot }: { config, lib, pkgs, ... }:
 {
   services.nginx.enable = true;
-  services.nginx.virtualHosts."crash-over-burn.com" = {
-    addSSL = true;
-    enableACME = true;
-    root = webroot;
-  };
-  services.nginx.virtualHosts."crash-over-burn.site" = {
-    addSSL = true;
-    enableACME = true;
-    root = webroot;
-  };
-  services.nginx.virtualHosts."crash-over-burn.online" = {
-    addSSL = true;
-    enableACME = true;
-    root = webroot;
-  };
   services.nginx.virtualHosts."crashoverburn.com" = {
     addSSL = true;
     enableACME = true;
     root = webroot;
   };
-  services.nginx.virtualHosts."crashoverburn.site" = {
-    addSSL = true;
-    enableACME = true;
-    root = webroot;
-  };
   services.nginx.virtualHosts."crashoverburn.online" = {
     addSSL = true;
     enableACME = true;