X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Feldiron.nix;h=35ce1812308f6767e6de0e23bacd920c5f2de220;hp=44d928b06a6ed5d1f9e2d99dd063f0d0065e0ff3;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hpb=9fb4205e2ceadb79a93cbe44bd77ebebe8c94625

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 44d928b..35ce181 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,4 +1,4 @@
-{ privateFiles ? ./., nixpkgsNext ? null }:
+{ privateFiles ? ./. }:
 {
   network = {
     description = "Immae's network";
@@ -6,41 +6,48 @@
   };
 
   eldiron = { config, pkgs, mylibs, myconfig, ... }:
-    with mylibs;
   {
+    nixpkgs.overlays = builtins.attrValues (import ../overlays);
     _module.args = {
-      pkgsNext = if builtins.isNull nixpkgsNext then pkgs else import nixpkgsNext {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
+      pkgsNext = import <nixpkgsNext> {};
+      pkgsPrevious = import <nixpkgsPrevious> {};
+      mylibs = import ../libs.nix { inherit pkgs; };
       myconfig = {
         inherit privateFiles;
         env = import "${privateFiles}/environment.nix";
-        ips = {
-          main = "176.9.151.89";
-          production = "176.9.151.154";
-          integration = "176.9.151.155";
-        };
       };
     };
 
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
+    networking = {
+      firewall.enable = true;
+      # 176.9.151.89 declared in nixops -> infra / tools
+      interfaces."eth0".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList
+        (n: ips: { address = ips.ip4; prefixLength = 32; })
+        (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") myconfig.env.servers.eldiron.ips);
+      interfaces."eth0".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 []))
+        myconfig.env.servers.eldiron.ips);
+    };
+
     imports = [
+      ./modules/ssh
       ./modules/certificates.nix
       ./modules/gitolite
       ./modules/databases
-      ./modules/mpd
+      ./modules/mpd.nix
       ./modules/websites
-      ./modules/mail
-      ./modules/ftp
+      ./modules/mail.nix
+      ./modules/ftp.nix
       ./modules/pub
       ./modules/task
-      ./modules/irc
+      ./modules/irc.nix
       ./modules/buildbot
-    ];
+      ./modules/dns.nix
+    ] ++ (builtins.attrValues (import ../modules));
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
-    services.myWebsites.production.enable = true;
-    services.myWebsites.integration.enable = true;
-    services.myWebsites.tools.enable = true;
     services.pure-ftpd.enable = true;
     services.irc.enable = true;
     services.pub.enable = true;
@@ -51,19 +58,13 @@
       MaxLevelStore="warning"
       MaxRetentionSec="1year"
       '';
-    networking = {
-      firewall = {
-        enable = true;
-        allowedTCPPorts = [ 22 ];
-      };
-    };
 
     deployment = {
       targetEnv = "hetzner";
       hetzner = {
         robotUser = myconfig.env.hetzner.user;
         robotPass = myconfig.env.hetzner.pass;
-        mainIPv4 = myconfig.ips.main;
+        mainIPv4 = myconfig.env.servers.eldiron.ips.main.ip4;
         partitions = ''
           clearpart --all --initlabel --drives=sda,sdb
 
@@ -78,35 +79,15 @@
       };
     };
 
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.telnet
       pkgs.htop
-      pkgs.vim
+      pkgs.iftop
     ];
 
-    services.openssh.extraConfig = ''
-      AuthorizedKeysCommand     /etc/ssh/ldap_authorized_keys
-      AuthorizedKeysCommandUser nobody
-      '';
-
-    environment.etc."ssh/ldap_authorized_keys" = let
-      ldap_authorized_keys =
-        wrap {
-          name = "ldap_authorized_keys";
-          file = ./ldap_authorized_keys.sh;
-          vars = {
-            LDAP_PASS = myconfig.env.sshd.ldap.password;
-            GITOLITE_SHELL = "${pkgs.gitolite}/bin/gitolite-shell";
-            ECHO = "${pkgs.coreutils}/bin/echo";
-          };
-          paths = [ pkgs.openldap pkgs.stdenv.shellPackage pkgs.gnugrep pkgs.gnused pkgs.coreutils ];
-        };
-    in {
-      enable = true;
-      mode = "0755";
-      user = "root";
-      source = ldap_authorized_keys;
-    };
+    environment.systemPackages = [
+      pkgs.vim
+    ];
 
     services.cron = {
       enable = true;