bastion: accept GIT_AUTHOR_* vars
Graham Christensen committed
Sep 26, 2019 at 03:00 UTC
74790b890ef77737894f817361ceb17dadcb2ee0
2 files changed
+2
-2
bastion/network.nix
+1
-1
@@ -147,7 +147,7 @@ in
147
# Temporary hack until we have proper users/roles.
148
services.openssh.extraConfig =
149
''
150
- AcceptEnv AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY FASTLY_API_KEY
150
+ AcceptEnv AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY FASTLY_API_KEY GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
151
'';
152
153
fileSystems."/scratch" =
delft/ceres.nix
+1
-1
@@ -50,7 +50,7 @@
50
services.hydra-dev.buildMachinesFiles = [ "/etc/nix/machines" ];
51
52
nix.gc.automatic = true;
53
- nix.gc.options = ''--max-freed "$((100 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
53
+ nix.gc.options = ''--max-freed "$((400 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
54
nix.gc.dates = "03,09,15,21:15";
55
56
nix.extraOptions = "gc-keep-outputs = false";