Fix dkim public key for froidmont.org

.gitignore

@@ -9,3 +9,4 @@ terraform.tfstate.backup
 .tmp
 terraform.tfvars
 .direnv
+.vscode

dns.tf

@@ -1,6 +1,5 @@
 locals {
   dmarc_value = "\"v=DMARC1; p=none; rua=mailto:failed-dmarc@banditlair.com; ruf=mailto:dmarc@banditlair.com\""
-  dkim_value = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwDEwt+a0neFlyq7ndCj0EECUp4bsusFpL2aVzroLY5Xw9S//dYuXUp1sr/yiivS71WyNjt7tOpuonu0gGEWpc6RPyeZrzXQg+zY1k/1+cLXFMz5HmJJaAbNxK02Qn89qfk/Y3pbuJt6Y/NBQ4KVOCZQB2hCT2izVSWSkhegYTCwIDAQAB\""
 }
 
 data "hetznerdns_zone" "banditlair_zone" {
@@ -100,7 +99,7 @@ resource "hetznerdns_record" "dmarc_report_falbo_txt" {
 resource "hetznerdns_record" "dkim_txt" {
   zone_id = data.hetznerdns_zone.banditlair_zone.id
   name    = "dkim._domainkey"
-  value = local.dkim_value
+  value   = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwDEwt+a0neFlyq7ndCj0EECUp4bsusFpL2aVzroLY5Xw9S//dYuXUp1sr/yiivS71WyNjt7tOpuonu0gGEWpc6RPyeZrzXQg+zY1k/1+cLXFMz5HmJJaAbNxK02Qn89qfk/Y3pbuJt6Y/NBQ4KVOCZQB2hCT2izVSWSkhegYTCwIDAQAB\""
   type    = "TXT"
   ttl     = 600
 }
@@ -160,7 +159,7 @@ resource "hetznerdns_record" "falbo_dmarc_txt" {
 resource "hetznerdns_record" "falbo_dkim_txt" {
   zone_id = data.hetznerdns_zone.falbo_zone.id
   name    = "dkim._domainkey"
-  value = local.dkim_value
+  value   = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWJwmQoiaxKCp6Cj+rELeHicd7VD1l/Q5KKQURgt1wIAY36bwbFYeuN/+ULruJzbnoyJ63G2QttO4H6MLdVTgNRjTuixmoE5mZEAE/7BlyAfDS0MLUXyGbxD6WtGZPT6PQ1cxWp9jVvYUs/NypcRfpDu0J9IXX6+coQM5CMLLdRwIDAQAB\""
   type    = "TXT"
   ttl     = 600
 }
@@ -220,7 +219,7 @@ resource "hetznerdns_record" "froidmont_dmarc_txt" {
 resource "hetznerdns_record" "froidmont_dkim_txt" {
   zone_id = data.hetznerdns_zone.froidmont_zone.id
   name    = "dkim._domainkey"
-  value = local.dkim_value
+  value   = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDlBZhkvPboheAWQtlWZCJpxIsjLvMOjn9TUHpyNz/tATA4/I6m21YlXreyHVoLLkaGOS/jXx2dptU/l6C0Bu+HdhcyBqw3tOxnTwDzD07h58u1mM5L//k/F+YsD+onCWYehQpIzCeRGgNe1w4QN11im4VVoNznFPzwMLIeepbg/QIDAQAB\""
   type    = "TXT"
   ttl     = 600
 }

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1626395775,
-        "narHash": "sha256-7Uo+4PIQGirfd7WfFuRuspLCyDT7eUn6pnJx/CL9UC8=",
-        "owner": "NixOS",
+        "lastModified": 1630248577,
+        "narHash": "sha256-9d/yq96TTrnF7qjA6wPYk+rYjWAXwfUmwk3qewezSeg=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a165aeceda9f9741d15bc2488425daeb06c0707e",
+        "rev": "8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-21.05",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,5 +1,5 @@
 {
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
   outputs = { self, nixpkgs }:
     let
@@ -17,7 +17,8 @@
         devShell.x86_64-linux = pkgs.mkShell {
           buildInputs = with pkgs; [
             nixpkgs-fmt
-          terraform_0_14
+            terraform
+            terraform-ls
             sops
           ];
         };
@@ -28,7 +29,9 @@
             modules = common.modules ++ [
               ./modules/postgresql.nix
               ./modules/custom-backup-job.nix
-            ({
+              ./modules/custom-backup-job.nix
+              (
+                {
                   networking.hostName = "db1";
                   networking.domain = "banditlair.com";
                   networking.firewall.interfaces."enp7s0".allowedTCPPorts = [ 5432 ];
@@ -40,7 +43,9 @@
                     '';
                     startAt = "03:00";
                   };
-            })
+                  system.stateVersion = "21.05";
+                }
+              )
             ];
           };
           backend1 = nixpkgs.lib.nixosSystem {
@@ -51,7 +56,8 @@
               ./modules/synapse.nix
               ./modules/nextcloud.nix
               ./modules/custom-backup-job.nix
-            ({
+              (
+                {
                   networking.hostName = "backend1";
                   networking.domain = "banditlair.com";
                   networking.localCommands = "ip addr add 95.216.177.3/32 dev enp1s0";
@@ -63,7 +69,9 @@
                     additionalPreHook = "cp /var/lib/murmur/murmur.sqlite /nix/var/data/murmur/murmur.sqlite";
                     startAt = "03:30";
                   };
-            })
+                  system.stateVersion = "21.05";
+                }
+              )
             ];
           };
         };

shell.nix

@@ -0,0 +1,10 @@
+(
+  import (
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz";
+      sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2";
+    }
+  ) {
+    src = ./.;
+  }
+).shellNix