From 79d2de8b83d765721b2cb720b2bc59673df54a4a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 7 May 2019 15:07:00 +0200
Subject: [PATCH] Move directories with only default.nix to standalone file

---
 nixops/eldiron.nix                                   | 12 ++++++------
 nixops/modules/{dns/default.nix => dns.nix}          |  0
 nixops/modules/{ftp/default.nix => ftp.nix}          |  0
 nixops/modules/{irc/default.nix => irc.nix}          |  0
 nixops/modules/{mail/default.nix => mail.nix}        |  0
 nixops/modules/{mpd/default.nix => mpd.nix}          |  0
 nixops/modules/{secrets/default.nix => secrets.nix}  |  0
 nixops/modules/websites/default.nix                  | 10 +++++-----
 .../websites/tools/{cloud/default.nix => cloud.nix}  |  0
 .../websites/tools/{db/default.nix => db.nix}        |  2 +-
 .../tools/{diaspora/default.nix => diaspora.nix}     |  0
 .../tools/{mastodon/default.nix => mastodon.nix}     |  0
 .../{mediagoblin/default.nix => mediagoblin.nix}     |  0
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename nixops/modules/{dns/default.nix => dns.nix} (100%)
 rename nixops/modules/{ftp/default.nix => ftp.nix} (100%)
 rename nixops/modules/{irc/default.nix => irc.nix} (100%)
 rename nixops/modules/{mail/default.nix => mail.nix} (100%)
 rename nixops/modules/{mpd/default.nix => mpd.nix} (100%)
 rename nixops/modules/{secrets/default.nix => secrets.nix} (100%)
 rename nixops/modules/websites/tools/{cloud/default.nix => cloud.nix} (100%)
 rename nixops/modules/websites/tools/{db/default.nix => db.nix} (90%)
 rename nixops/modules/websites/tools/{diaspora/default.nix => diaspora.nix} (100%)
 rename nixops/modules/websites/tools/{mastodon/default.nix => mastodon.nix} (100%)
 rename nixops/modules/websites/tools/{mediagoblin/default.nix => mediagoblin.nix} (100%)

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index d62f022..239e065 100644
--- 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 028f60b..06face1 100644
--- 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 2a82bd6..6957e30 100644
--- 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
-- 
2.41.0