Merge branch 'pr/refactor-containers' into 'master'

containers: make all variables explicit

See merge request steveeJ/infra!50

nix/os/containers/backup.nix

@@ -1,4 +1,7 @@
-{ config, ... } @ args:
+{ config
+, hostAddress
+, localAddress
+}:
 
 let
   unstablepkgs = import <channels-nixos-unstable> { config = config.nixpkgs.config; };
@@ -63,7 +66,7 @@ let
     };
 
 
-in args // {
+in {
   config = { pkgs, ... }: {
     imports = [
       ../profiles/containers/configuration.nix
@@ -189,4 +192,6 @@ in args // {
   privateNetwork = true;
   forwardPorts = [
   ];
+
+  inherit hostAddress localAddress;
 }

nix/os/containers/mailserver.nix

@@ -1,12 +1,13 @@
-{ ... } @ args:
+{ hostAddress
+, localAddress
+, imapsPort ? 993
+, sievePort ? 4190
+}:
 
 let
   passwords = import ../../variables/passwords.crypt.nix;
 
-in
-{ imapsPort ? 993
-, sievePort ? 4190
-}: args // {
+in {
 
   config = { pkgs, ... }: {
     imports = [
@@ -158,4 +159,6 @@ in
       protocol = "tcp";
     }
   ];
+
+  inherit hostAddress localAddress;
 }

nix/os/containers/syncthing.nix

@@ -1,10 +1,9 @@
-{ ... } @ args:
+{ hostAddress
+, localAddress
+, syncthingPort ? 22000
+}:
 
-let
-
-in
-{ syncthingPort ? 22000
-}: args // {
+{
 
   config = { config, pkgs, ... }: {
     imports = [
@@ -41,4 +40,6 @@ in
       protocol = "tcp";
     }
   ];
+
+  inherit hostAddress localAddress;
 }

nix/os/containers/webserver.nix

@@ -1,10 +1,7 @@
-{ ... } @ args:
-
-let
-
-in
-{ httpsPort ? 443
-}: args // {
+{ hostAddress
+, localAddress
+, httpsPort ? 443
+}: {
   config = { config, pkgs, ... }: {
     imports = [
       ../profiles/containers/configuration.nix
@@ -95,4 +92,6 @@ in
       protocol = "tcp";
     }
   ];
+
+  inherit hostAddress localAddress;
 }

nix/os/devices/vmd32387.contaboserver.net/system.nix

@@ -101,7 +101,7 @@ in {
     mailserver = import ../../containers/mailserver.nix {
       hostAddress = "192.168.100.10";
       localAddress = "192.168.100.11";
-    } {
+
       imapsPort = 993;
       sievePort = 4190;
     };
@@ -109,14 +109,14 @@ in {
     webserver = import ../../containers/webserver.nix {
       hostAddress = "192.168.100.12";
       localAddress = "192.168.100.13";
-    } {
+
       httpsPort = 443;
     };
 
     syncthing = import ../../containers/syncthing.nix {
       hostAddress = "192.168.100.14";
       localAddress = "192.168.100.15";
-    } {
+
       syncthingPort = 22000;
     };