Merge remote-tracking branch 'origin/develop' into 41.system-tests-perl-to-python

morph/lib/issuer-aws.nix

@@ -9,7 +9,7 @@
   boot.kernel.sysctl = { "vm.swappiness" = 0; };
   swapDevices = [ {
     device = "/var/swapfile";
-    size = 8192; # megabytes
+    size = 4096; # megabytes
     randomEncryption = true;
   } ];
 
@@ -17,4 +17,11 @@
   # morph-supplied name.  See also
   # <https://github.com/DBCDK/morph/issues/146>.
   networking.hostName = name;
+
+  # Clean up packages after a while
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 30d";
+  };
 }

nixos/modules/monitoring/server/grafana-config/resources-overview.json

@@ -1279,7 +1279,7 @@
     "to": "now"
   },
   "timepicker": {},
-  "timezone": "utc",
+  "timezone": "",
   "title": "Resources overview",
   "uid": "ResourcesOverview",
   "version": 1

nixos/modules/monitoring/server/grafana.nix

@@ -86,6 +86,8 @@ in {
       extraOptions = {
         # Defend against DNS rebinding attacks.
         SERVER_ENFORCE_DOMAIN = "true";
+        # Same time zone for all users by default
+        DATE_FORMATS_DEFAULT_TIMEZONE = "UTC";
       };
 
       auth = {