Move directories with only default.nix to standalone file

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index d62f022b759ca14879fa70d92816f52b29e0bccb..239e0650fe534ab3a72c19c26ea54100e62f604f 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -36,16 +36,16 @@
       ./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/secrets
+      ./modules/dns.nix
+      ./modules/secrets.nix
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;

diff --git a/nixops/modules/dns/default.nix b/nixops/modules/dns.nix
similarity index 100%
rename from nixops/modules/dns/default.nix
rename to nixops/modules/dns.nix

diff --git a/nixops/modules/ftp/default.nix b/nixops/modules/ftp.nix
similarity index 100%
rename from nixops/modules/ftp/default.nix
rename to nixops/modules/ftp.nix

diff --git a/nixops/modules/irc/default.nix b/nixops/modules/irc.nix
similarity index 100%
rename from nixops/modules/irc/default.nix
rename to nixops/modules/irc.nix

diff --git a/nixops/modules/mail/default.nix b/nixops/modules/mail.nix
similarity index 100%
rename from nixops/modules/mail/default.nix
rename to nixops/modules/mail.nix

diff --git a/nixops/modules/mpd/default.nix b/nixops/modules/mpd.nix
similarity index 100%
rename from nixops/modules/mpd/default.nix
rename to nixops/modules/mpd.nix

diff --git a/nixops/modules/secrets/default.nix b/nixops/modules/secrets.nix
similarity index 100%
rename from nixops/modules/secrets/default.nix
rename to nixops/modules/secrets.nix

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 028f60bf5232e2792d59684d360f56b061196252..06face14442a3654df4bd5b81f939607d6b4fec9 100644 (file)
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -121,14 +121,14 @@ in
     ./ftp/immae.nix
     ./ftp/release.nix
     ./ftp/temp.nix
-    ./tools/db
+    ./tools/db.nix
     ./tools/tools
     ./tools/dav
-    ./tools/cloud
+    ./tools/cloud.nix
     ./tools/git
-    ./tools/mastodon
-    ./tools/mediagoblin
-    ./tools/diaspora
+    ./tools/mastodon.nix
+    ./tools/mediagoblin.nix
+    ./tools/diaspora.nix
     ./tools/ether
     ./tools/peertube
     # built using:

diff --git a/nixops/modules/websites/tools/cloud/default.nix b/nixops/modules/websites/tools/cloud.nix
similarity index 100%
rename from nixops/modules/websites/tools/cloud/default.nix
rename to nixops/modules/websites/tools/cloud.nix

diff --git a/nixops/modules/websites/tools/db/default.nix b/nixops/modules/websites/tools/db.nix
similarity index 90%
rename from nixops/modules/websites/tools/db/default.nix
rename to nixops/modules/websites/tools/db.nix
index 2a82bd6d0684bca44b89938af46d4c574af64de4..6957e3024ddec8fd9fdb6e2ef124efbf4d8398d1 100644 (file)
--- a/nixops/modules/websites/tools/db/default.nix
+++ b/nixops/modules/websites/tools/db.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    adminer = pkgs.callPackage ../../commons/adminer.nix {};
+    adminer = pkgs.callPackage ../commons/adminer.nix {};
 
     cfg = config.services.myWebsites.tools.databases;
 in {

diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora.nix
similarity index 100%
rename from nixops/modules/websites/tools/diaspora/default.nix
rename to nixops/modules/websites/tools/diaspora.nix

diff --git a/nixops/modules/websites/tools/mastodon/default.nix b/nixops/modules/websites/tools/mastodon.nix
similarity index 100%
rename from nixops/modules/websites/tools/mastodon/default.nix
rename to nixops/modules/websites/tools/mastodon.nix

diff --git a/nixops/modules/websites/tools/mediagoblin/default.nix b/nixops/modules/websites/tools/mediagoblin.nix
similarity index 100%
rename from nixops/modules/websites/tools/mediagoblin/default.nix
rename to nixops/modules/websites/tools/mediagoblin.nix