X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fsystem%2Fbackup-2.nix;h=4e24c1244253009ea0b844b319542cde52f0cbb1;hp=84e52d59635546e922842ebf0ba957b781e875e6;hb=739d28eaf8cb226f74a7e7f5ad31fb152a90ee4b;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9

diff --git a/modules/private/system/backup-2.nix b/modules/private/system/backup-2.nix
index 84e52d5..4e24c12 100644
--- a/modules/private/system/backup-2.nix
+++ b/modules/private/system/backup-2.nix
@@ -3,7 +3,6 @@
 {
   boot.kernelPackages = pkgs.linuxPackages_latest;
   myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; };
-  hostEnv.FQDN = "backup-2.v.immae.eu";
 
   imports = builtins.attrValues (import ../..);
 
@@ -28,19 +27,21 @@
     firewall.enable = true;
     interfaces."ens3".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList
       (n: ips: { address = ips.ip4; prefixLength = 32; })
-      (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.myEnv.servers.backup-2.ips);
+      (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.hostEnv.ips);
     interfaces."ens3".ipv6.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList
       (n: ips: map (ip: { address = ip; prefixLength = (if n == "main" && ip == pkgs.lib.head ips.ip6 then 64 else 128); }) (ips.ip6 or []))
-      config.myEnv.servers.backup-2.ips);
+      config.hostEnv.ips);
+    defaultGateway6 = { address = "fe80::1"; interface = "ens3"; };
+  };
 
-    defaultMailServer = {
-      directDelivery = true;
-      hostName = "eldiron.immae.eu:25";
-      useTLS = true;
-      useSTARTTLS = true;
-      root = "postmaster@immae.eu";
-    };
+  myServices.certificates.enable = true;
+  services.nginx = {
+    enable = true;
+    recommendedOptimisation = true;
+    recommendedGzipSettings = true;
+    recommendedProxySettings = true;
   };
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
 
   services.cron = {
     mailto = "cron@immae.eu";
@@ -49,12 +50,13 @@
 
   services.rsyncBackup = {
     mountpoint = "/backup2";
-    mailto = config.myEnv.rsync_backup.mailto;
     profiles = config.myEnv.rsync_backup.profiles;
     ssh_key_public = config.myEnv.rsync_backup.ssh_key.public;
     ssh_key_private = config.myEnv.rsync_backup.ssh_key.private;
   };
 
+  myServices.mailRelay.enable = true;
+  myServices.mailBackup.enable = true;
   myServices.monitoring.enable = true;
   myServices.databasesReplication = {
     postgresql = {
@@ -63,7 +65,7 @@
       hosts = {
         eldiron = {
           slot = "backup_2";
-          connection = "postgresql://backup-2:${config.myEnv.servers.backup-2.ldap.password}@eldiron.immae.eu";
+          connection = "postgresql://backup-2:${config.hostEnv.ldap.password}@eldiron.immae.eu";
         };
       };
     };
@@ -77,7 +79,7 @@
           host = config.myEnv.servers.eldiron.ips.main.ip4;
           port = "3306";
           user = "backup-2";
-          password = config.myEnv.servers.backup-2.ldap.password;
+          password = config.hostEnv.ldap.password;
           dumpUser = "root";
           dumpPassword = config.myEnv.databases.mysql.systemUsers.root;
         };