Move websites/tools to modules

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

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index d62f022b759ca14879fa70d92816f52b29e0bccb..59ff85a1fbd6cd5a8d55a5797b2a226a337338de 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -35,25 +35,18 @@
       ./modules/ssh
       ./modules/certificates.nix
       ./modules/gitolite
-      ./modules/databases
-      ./modules/mpd
-      ./modules/websites
-      ./modules/mail
-      ./modules/ftp
+      ./modules/mpd.nix
+      ./modules/mail.nix
+      ./modules/ftp.nix
       ./modules/pub
       ./modules/task
-      ./modules/irc
       ./modules/buildbot
-      ./modules/dns
-      ./modules/secrets
-    ];
+      ./modules/dns.nix
+    ] ++ (builtins.attrValues (import ../modules));
+    myServices.databases.enable = true;
+    myServices.irc.enable = true;
     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;
     services.myTasks.enable = true;
     services.buildbot.enable = true;