Skip to content

Commit

Permalink
[OPS-1514] Fix errors after bumping flake inputs
Browse files Browse the repository at this point in the history
Problem: we need to update flake inputs from time to time,
this bump caused some CI test failures

Solution:
- fix terraform license change
- fix infinite recursion related to mdadm.conf
- fix services.dnsmaq.servers
- fix services.dnsmaq dependency on efi.mount
- remove obsolete docker options
  • Loading branch information
karandit committed Dec 18, 2023
1 parent 0293742 commit e3f2ff5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@
};
} // flake-utils.lib.eachDefaultSystem (system:
let
pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} allOverlays;
pkgsAllowUnfree = import nixpkgs {
inherit system;
config.allowUnfreePredicate = pkg: builtins.elem (pkg.pname) [ "terraform" ];
};
pkgs = serokell-nix.lib.pkgsWith pkgsAllowUnfree allOverlays;

tfConfigAst = terranix.lib.terranixConfigurationAst {
inherit system pkgs;
Expand Down
2 changes: 0 additions & 2 deletions lib/common/edna/server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

virtualisation.docker = {
enable = true;
logLevel = "warn";
storageDriver = "overlay2";
networks.edna = {};
};

virtualisation.oci-containers.containers = let
Expand Down
7 changes: 3 additions & 4 deletions servers/alzirr/platform.nix
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@
# machines irrespective of host names.
# We do not worry about plugging disks into the wrong machine because
# we will never exchange disks between machines.
environment.etc."mdadm.conf".text = ''
HOMEHOST hetzner
'';
# The RAIDs are assembled in stage1, so we need to make the config
# available there.
boot.swraid.mdadmConf = config.environment.etc."mdadm.conf".text;
boot.swraid.mdadmConf = ''
HOMEHOST hetzner
'';

# Default mdmonitor service does not work, fix it by directing events to the log.
# See https://github.com/NixOS/nixpkgs/issues/72394
Expand Down
4 changes: 2 additions & 2 deletions servers/wasat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ in {
# dns server blocking malicious hostnames
services.dnsmasq = {
enable = true;
servers = [ "1.1.1.1" "1.0.0.1" ];
settings.server = [ "1.1.1.1" "1.0.0.1" ];
resolveLocalQueries = false;
extraConfig = ''
interface=wg-serokell
Expand All @@ -73,5 +73,5 @@ in {
};

# dnsmasq needs wireguard interface
systemd.services.dnsmasq.after = [ "wireguard-wg-serokell.service" ];
systemd.services.dnsmasq.after = [ "wireguard-wg-serokell.service" "efi.mount"];
}

0 comments on commit e3f2ff5

Please sign in to comment.