Use acme directory config rather than hardcoding the value

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

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 239e0650fe534ab3a72c19c26ea54100e62f604f..37f901e5e39855b63d3da7167c04e3914b03604d 100644 (file)
--- 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;