diff options
| -rw-r--r-- | config/common.nix | 3 | ||||
| -rw-r--r-- | config/orbekk-pkgs.nix | 3 | ||||
| -rw-r--r-- | data/dns/db.kufieta.net.zone | 7 | ||||
| -rw-r--r-- | data/dns/db.orbekk.com.zone | 6 | ||||
| -rw-r--r-- | data/dns/db.orbekk.no.zone | 7 |
5 files changed, 14 insertions, 12 deletions
diff --git a/config/common.nix b/config/common.nix index 6efcbcb..2ca58f7 100644 --- a/config/common.nix +++ b/config/common.nix @@ -42,7 +42,6 @@ buildCores = lib.mkDefault 0; # auto configure gc.automatic = lib.mkDefault true; nixPath = lib.mkBefore [ - "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" "nixpkgs-stable=https://nixos.org/channels/nixos-18.03/nixexprs.tar.xz" "nixpkgs-unstable=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz" "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" @@ -54,6 +53,8 @@ ]; binaryCaches = trustedBinaryCaches; binaryCachePublicKeys = [ "hydra.orbekk.com-1:aAKJuVqMptWoFfY9fhUADdXw5LM5IfSGjTSobuxg+Bo=" ]; + daemonNiceLevel = 10; + daemonIONiceLevel = 5; }; boot.cleanTmpDir = true; diff --git a/config/orbekk-pkgs.nix b/config/orbekk-pkgs.nix index ce29f59..0c81eb7 100644 --- a/config/orbekk-pkgs.nix +++ b/config/orbekk-pkgs.nix @@ -2,12 +2,11 @@ # "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" { config, lib, pkgs, ... }: let - orbekkPkgs = import <orbekk> {}; stablePkgs = import <nixpkgs-stable> {}; in { nixpkgs.config.packageOverrides = pkgs: { # Broken in nixos-unstable matrix-synapse = stablePkgs.matrix-synapse; - } // orbekkPkgs; + }; } diff --git a/data/dns/db.kufieta.net.zone b/data/dns/db.kufieta.net.zone index f52c8e3..35e7ddc 100644 --- a/data/dns/db.kufieta.net.zone +++ b/data/dns/db.kufieta.net.zone @@ -14,9 +14,6 @@ $TTL 3600 IN MX 20 in2-smtp.messagingengine.com. @ IN TXT "v=spf1 include:spf.messagingengine.com ?all" -fm1._domainkey IN CNAME fm1.kufieta.net.dkim.fmhosted.com -fm2._domainkey IN CNAME fm2.kufieta.net.dkim.fmhosted.com -fm3._domainkey IN CNAME fm3.kufieta.net.dkim.fmhosted.com @ IN AAAA 2001:470:8e2e:20:f05b:e3ff:fed9:58f7 @ IN A 71.246.108.215 @@ -29,3 +26,7 @@ latdyr IN A 71.246.108.215 latdyr IN AAAA 2001:470:8e2e:20:f05b:e3ff:fed9:7a20 _acme-challenge IN CNAME _acme-challenge.dynamic.orbekk.com. + +fm1._domainkey IN CNAME fm1.kufieta.net.dkim.fmhosted.com. +fm2._domainkey IN CNAME fm2.kufieta.net.dkim.fmhosted.com. +fm3._domainkey IN CNAME fm3.kufieta.net.dkim.fmhosted.com. diff --git a/data/dns/db.orbekk.com.zone b/data/dns/db.orbekk.com.zone index 4e44d89..7205c11 100644 --- a/data/dns/db.orbekk.com.zone +++ b/data/dns/db.orbekk.com.zone @@ -1,8 +1,8 @@ $INCLUDE db.orbekk.shared.zone -fm1._domainkey IN CNAME fm1.orbekk.com.dkim.fmhosted.com -fm2._domainkey IN CNAME fm2.orbekk.com.dkim.fmhosted.com -fm3._domainkey IN CNAME fm3.orbekk.com.dkim.fmhosted.com +fm1._domainkey IN CNAME fm1.orbekk.com.dkim.fmhosted.com. +fm2._domainkey IN CNAME fm2.orbekk.com.dkim.fmhosted.com. +fm3._domainkey IN CNAME fm3.orbekk.com.dkim.fmhosted.com. @ IN CAA 0 issue "buypass.com" @ IN CAA 0 issue "letsencrypt.org" diff --git a/data/dns/db.orbekk.no.zone b/data/dns/db.orbekk.no.zone index 23eb258..01580a3 100644 --- a/data/dns/db.orbekk.no.zone +++ b/data/dns/db.orbekk.no.zone @@ -1,8 +1,9 @@ $INCLUDE db.orbekk.shared.zone +$ORIGIN orbekk.no. -fm1._domainkey IN CNAME fm1.orbekk.no.dkim.fmhosted.com -fm2._domainkey IN CNAME fm2.orbekk.no.dkim.fmhosted.com -fm3._domainkey IN CNAME fm3.orbekk.no.dkim.fmhosted.com +fm1._domainkey IN CNAME fm1.orbekk.no.dkim.fmhosted.com. +fm2._domainkey IN CNAME fm2.orbekk.no.dkim.fmhosted.com. +fm3._domainkey IN CNAME fm3.orbekk.no.dkim.fmhosted.com. @ IN CAA 128 issue "letsencrypt.org" @ IN CAA 128 issue "buypass.com" |