webserver: Move config into a single file

container/webserver/config.nix

@@ -1,6 +1,24 @@
 { secret, ... }:
 
 {
+  # mosquitto
+
+  environment.etc."container-webserver/mosquitto/mosquitto.conf" = {
+    text = ''
+      listener 1883
+      password_file /mosquitto/config/users.conf
+    '';
+
+    mode = "0644";
+  };
+
+  environment.etc."container-webserver/mosquitto/users.conf" = {
+    text = secret.container.webserver.mosquitto.users;
+    mode = "0644";
+  };
+
+  # traefik
+
   environment.etc."container-webserver/traefik/traefik.toml" = {
     text = ''
       [providers]

container/webserver/config/mosquitto.nix

@@ -1,17 +0,0 @@
-{ secret, ... }:
-
-{
-  environment.etc."container-webserver/mosquitto/mosquitto.conf" = {
-    text = ''
-      listener 1883
-      password_file /mosquitto/config/users.conf
-    '';
-
-    mode = "0644";
-  };
-
-  environment.etc."container-webserver/mosquitto/users.conf" = {
-    text = secret.container.webserver.mosquitto.users;
-    mode = "0644";
-  };
-}

container/webserver/default.nix

@@ -1,9 +1,6 @@
 let
   secret = import ../../secret/container/webserver.nix;
-  config-mosquitto = import ./config/mosquitto.nix { inherit secret; };
+  custom-config = import ./config.nix { inherit secret; };
-  config-traefik = import ./config/traefik.nix { inherit secret; };
-
-  custom-config = config-mosquitto // config-traefik;
 in
 {
   virtualisation.arion.projects.webserver.settings = {