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

Merge branch 'pr/fix-mailserver-postugprade' into 'master'

Browse source 
vmd32387/containers: pass resolv.conf to containers

See merge request steveeJ/infra!38
This commit is contained in:
steveej 2020-03-16 21:27:10 +00:00
commit ff9ab68b3c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ in args // {
serviceConfig.RestartSec = 600;
serviceConfig.Restart = "always";
description = "Getmail service";
path = [ pkgs.getmail ];
path = [ ];
script = let
rc = pkgs.writeText "mailATstefanjunker.de.getmail.rc" ''
[options]
@ -82,7 +82,7 @@ in args // {
path = ${pkgs.dovecot}/libexec/dovecot/dovecot-lda
'';
in ''
getmail --rcfile=${rc} --idle=INBOX
${pkgs.getmail}/bin/getmail --rcfile=${rc} --idle=INBOX
'';
};

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

@ -95,6 +95,8 @@ in {
done
'';
networking.useHostResolvConf = true;
containers = {
mailserver = import ../../containers/mailserver.nix {
hostAddress = "192.168.100.10";