nix: remove old build rules

[sourcephile-nix.git] / machines / losurdo / prosody.nix

diff --git a/machines/losurdo/prosody.nix b/machines/losurdo/prosody.nix
index d551de87522b9e24f7e00482099573af56700a82..1159d7eb8b0ddeebac3537a404030ead9919b1e8 100644 (file)
--- a/machines/losurdo/prosody.nix
+++ b/machines/losurdo/prosody.nix
@@ -1,20 +1,19 @@
-{ pkgs, lib, config, machines, ... }:
+{ pkgs, lib, config, machines, ipv4, ... }:
 let
-  inherit (builtins.extraBuiltins) pass-chomp;
   inherit (config) networking;
   inherit (config.services) prosody;
   inherit (machines.mermet.config.services) coturn;
 in
 {
 imports = [
-  #prosody/biboumi.nix
+  prosody/biboumi.nix
+  #../../sec/machines/losurdo/prosody.nix
 ];
 networking.nftables.ruleset = ''
   add rule inet filter net2fw tcp dport {5222,5269} counter accept comment "XMPP"
   add rule inet filter net2fw tcp dport 5000 counter accept comment "XMPP XEP-0065 File Transfer Proxy"
   add rule inet filter net2fw tcp dport {${lib.concatMapStringsSep "," toString prosody.httpsPorts}} counter accept comment "XMPP HTTPS"
-  add rule inet filter fw2net meta skuid ${prosody.user} tcp dport 3478 counter accept comment "TURN"
-  add rule inet filter fw2net meta skuid ${prosody.user} udp dport 3478 counter accept comment "TURN"
+  add rule inet filter fw2net meta skuid ${prosody.user} counter accept comment "Prosody"
 '';
 users.groups.acme.members = [ prosody.user ];
 security.acme.certs."${networking.domain}" = {
@@ -30,13 +29,16 @@ services.prosody = {
   xmppComplianceSuite = true;
   modules = {
     announce = true;
+    blocklist = true;
     cloud_notify = true;
     groups = true;
     limits = false;
     motd = true;
+    server_contact_info = true;
     watchregistrations = true;
     websocket = false;
     welcome = true;
+    proxy65 = false;
   };
   extraModules = [
     "turncredentials"
@@ -44,38 +46,35 @@ services.prosody = {
     #"extdisco"
   ];
   extraConfig = ''
+    -- Listen only in IPv4 until hosting provider's IPv6 works well.
+    interfaces = { "0.0.0.0" }
+    c2s_interfaces = { "0.0.0.0" }
+    contact_info = {
+      --abuse = { "mailto:abuse@${networking.domain}", "xmpp:abuse@${networking.domain}" };
+      --admin = { "mailto:admin@${networking.domain}", "xmpp:admin@${networking.domain}" };
+      --feedback = { "http://${networking.domain}/feedback.php", "mailto:feedback@${networking.domain}", "xmpp:feedback@${networking.domain}" };
+      --sales = { "xmpp:bard@${networking.domain}" };
+      --security = { "xmpp:security@${networking.domain}" };
+      --support = { "http://${networking.domain}/support.php", "xmpp:support@${networking.domain}" };
+    }
+    legacy_ssl_ports = { 5222 }
+
     turncredentials_host = "turn.${networking.domain}"
-    turncredentials_secret = "${pass-chomp "machines/mermet/coturn/static-auth-secret"}"
     turncredentials_port = 3478
-
-    --external_services = {
-    --  ["turn.${networking.domain}"] = {
-    --      port="${toString coturn.alt-listening-port}";
-    --      transport="udp";
-    --      type="stun";
-    --  };
-    --  ["turn.${networking.domain}"] = {
-    --      port="${toString coturn.listening-port}";
-    --      transport="udp";
-    --      type="turn";
-    --      password="${pass-chomp "machines/mermet/coturn/static-auth-secret"}";
-    --      -- username="";
-    --  };
-    --}
+    
     --http_files_dir = "/var/lib/prosody/files"
-    -- http_external_url = "https://tmp.${networking.domain}:5281"
-    -- https_certificate = "/var/lib/acme/${networking.domain}/fullchain.pem"
-    -- https_key = "/var/lib/acme/${networking.domain}/key.pem"
-    -- certificates = "/var/lib/acme"
+    --http_external_url = "https://tmp.${networking.domain}:5281"
+    --https_certificate = "/var/lib/acme/${networking.domain}/fullchain.pem"
+    --https_key = "/var/lib/acme/${networking.domain}/key.pem"
+    --certificates = "/var/lib/acme"
 
     proxy65_ports = 5000
     Component "proxy65.${networking.domain}" "proxy65"
       proxy65_address = "proxy65.${networking.domain}"
       proxy65_acl = { "${networking.domain}" }
       
-
-    -- Component "irc.${networking.domain}"
-    --   component_secret = "useless-secret-on-loopback"
+    Component "biboumi.${networking.domain}"
+      component_secret = "useless-secret-on-loopback"
   '';
   #ports = {80};
   #ssl_ports = {443};
@@ -124,10 +123,14 @@ services.prosody = {
   authentication = "internal_hashed";
   httpPorts = [];
   httpsPorts = [5281];
-  disco_items = [];
+  disco_items = [
+    { url = "biboumi.${networking.domain}";
+      description = "Passerelle vers des serveurs IRC (Internet Relay Chat)"; }
+  ];
   package = pkgs.prosody.override {
     withCommunityModules = [
       "turncredentials"
+      #"extdisco"
     ];
   };
 };