diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
| commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
| tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /nixos/modules/virtualisation | |
| parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
| parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) | |
| download | nixlib-595a72589f038e4512ca12232009c97a47fba044.tar nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.gz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.bz2 nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.lz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.xz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.zst nixlib-595a72589f038e4512ca12232009c97a47fba044.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eaf8b14cd8e1..0b6bec786da4 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -57,6 +57,12 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Make sure GCE image does not replace host key that NixOps sets + environment.etc."default/instance_configs.cfg".text = lib.mkDefault '' + [InstanceSetup] + set_host_keys = false + ''; + # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; @@ -69,6 +75,9 @@ in networking.usePredictableInterfaceNames = false; + # GC has 1460 MTU + networking.interfaces.eth0.mtu = 1460; + # allow the google-accounts-daemon to manage users users.mutableUsers = true; # and allow users to sudo without password |