X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=37f901e5e39855b63d3da7167c04e3914b03604d;hb=9ade8f6eb774dc7d19d82a070199b5024786b819;hp=239e0650fe534ab3a72c19c26ea54100e62f604f;hpb=79d2de8b83d765721b2cb720b2bc59673df54a4a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 239e065..37f901e 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -35,7 +35,6 @@
       ./modules/ssh
       ./modules/certificates.nix
       ./modules/gitolite
-      ./modules/databases
       ./modules/mpd.nix
       ./modules/websites
       ./modules/mail.nix
@@ -45,13 +44,9 @@
       ./modules/irc.nix
       ./modules/buildbot
       ./modules/dns.nix
-      ./modules/secrets.nix
-    ];
+    ] ++ (builtins.attrValues (import ../modules));
+    myServices.databases.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;