steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
containers: make all host ports configurable

See merge request steveeJ/infra!49
This commit is contained in:
steveej 2020-09-15 14:56:35 +00:00
commit fc94819a23
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nix/os/containers/mailserver.nix
View file

@ -3,7 +3,11 @@
let let
passwords = import ../../variables/passwords.crypt.nix; passwords = import ../../variables/passwords.crypt.nix;
in args // { in
{ imapsPort ? 993
, sievePort ? 4190
}: args // {
config = { pkgs, ... }: { config = { pkgs, ... }: {
imports = [ imports = [
../profiles/containers/configuration.nix ../profiles/containers/configuration.nix
@ -143,14 +147,14 @@ in args // {
{ {
# imaps # imaps
containerPort = 993; containerPort = 993;
hostPort = 993; hostPort = imapsPort;
protocol = "tcp"; protocol = "tcp";
} }
{ {
# sieve # sieve
containerPort = 4190; containerPort = 4190;
hostPort = 4190; hostPort = sievePort;
protocol = "tcp"; protocol = "tcp";
} }
]; ];

7
nix/os/containers/syncthing.nix
View file

@ -2,7 +2,10 @@
let let
in args // { in
{ syncthingPort ? 22000
}: args // {
config = { config, pkgs, ... }: { config = { config, pkgs, ... }: {
imports = [ imports = [
../profiles/containers/configuration.nix ../profiles/containers/configuration.nix
@ -34,7 +37,7 @@ in args // {
forwardPorts = [ forwardPorts = [
{ {
containerPort = 22000; containerPort = 22000;
hostPort = 22000; hostPort = syncthingPort;
protocol = "tcp"; protocol = "tcp";
} }
]; ];

6
nix/os/containers/webserver.nix
View file

@ -2,7 +2,9 @@
let let
in args // { in
{ httpsPort ? 443
}: args // {
config = { config, pkgs, ... }: { config = { config, pkgs, ... }: {
imports = [ imports = [
../profiles/containers/configuration.nix ../profiles/containers/configuration.nix
@ -89,7 +91,7 @@ in args // {
{ {
# https # https
containerPort = 443; containerPort = 443;
hostPort = 443; hostPort = httpsPort;
protocol = "tcp"; protocol = "tcp";
} }
]; ];

7
nix/os/devices/vmd32387.contaboserver.net/system.nix
View file

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