Start moving websites configuration to modules

[perso/Immae/Config/Nix.git] / nixops / eldiron.nix

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index f254a05ef28a5561604d2737796ae73ba194b6e6..35ce1812308f6767e6de0e23bacd920c5f2de220 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -7,17 +7,19 @@
 
   eldiron = { config, pkgs, mylibs, myconfig, ... }:
   {
+    nixpkgs.overlays = builtins.attrValues (import ../overlays);
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
+      mylibs = import ../libs.nix { inherit pkgs; };
       myconfig = {
         inherit privateFiles;
         env = import "${privateFiles}/environment.nix";
       };
     };
 
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
     networking = {
       firewall.enable = true;
       # 176.9.151.89 declared in nixops -> infra / tools
@@ -34,21 +36,18 @@
       ./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
-    ];
+      ./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;
@@ -80,9 +79,13 @@
       };
     };
 
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.telnet
       pkgs.htop
+      pkgs.iftop
+    ];
+
+    environment.systemPackages = [
       pkgs.vim
     ];