phfroidmont/self-hosting
1
0
Fork 0
mirror of https://github.com/phfroidmont/self-hosting.git synced 2025-12-25 05:36:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dkim public key for froidmont.org

Browse source
This commit is contained in:
Paul-Henri Froidmont 2021-09-02 16:11:58 +02:00
parent 807fade22b
commit df9573573c
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
5 changed files with 193 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

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

225
dns.tf
View file

@ -1,6 +1,5 @@
locals { locals {
dmarc_value = "\"v=DMARC1; p=none; rua=mailto:failed-dmarc@banditlair.com; ruf=mailto:dmarc@banditlair.com\"" 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" { data "hetznerdns_zone" "banditlair_zone" {
@ -9,100 +8,100 @@ data "hetznerdns_zone" "banditlair_zone" {
resource "hetznerdns_record" "banditlair_hcloud_a" { resource "hetznerdns_record" "banditlair_hcloud_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "@" name = "@"
value = data.hcloud_floating_ip.main_ip.ip_address value = data.hcloud_floating_ip.main_ip.ip_address
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "banditlair_dedicated_a" { resource "hetznerdns_record" "banditlair_dedicated_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "*" name = "*"
value = "144.76.18.197" value = "144.76.18.197"
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "nextcloud_a" { resource "hetznerdns_record" "nextcloud_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "cloud" name = "cloud"
value = data.hcloud_floating_ip.main_ip.ip_address value = data.hcloud_floating_ip.main_ip.ip_address
type = "A" type = "A"
ttl = 600 ttl = 600
} }
# Matrix # Matrix
resource "hetznerdns_record" "matrix_a" { resource "hetznerdns_record" "matrix_a" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "matrix" name = "matrix"
value = data.hcloud_floating_ip.main_ip.ip_address value = data.hcloud_floating_ip.main_ip.ip_address
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "matrix_srv" { resource "hetznerdns_record" "matrix_srv" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "_matrix._tcp" name = "_matrix._tcp"
value = "12 10 443 matrix" value = "12 10 443 matrix"
type = "SRV" type = "SRV"
ttl = 86400 ttl = 86400
} }
# Email # Email
resource "hetznerdns_record" "mail_mx" { resource "hetznerdns_record" "mail_mx" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "@" name = "@"
value = "12 mail" value = "12 mail"
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "mail2_mx" { resource "hetznerdns_record" "mail2_mx" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "@" name = "@"
value = "20 mail2" value = "20 mail2"
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "spf_txt" { resource "hetznerdns_record" "spf_txt" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "@" name = "@"
value = "\"v=spf1 mx -all\"" value = "\"v=spf1 mx -all\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "dmarc_txt" { resource "hetznerdns_record" "dmarc_txt" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "_dmarc" name = "_dmarc"
value = local.dmarc_value value = local.dmarc_value
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "dmarc_report_froidmont_txt" { resource "hetznerdns_record" "dmarc_report_froidmont_txt" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "froidmont.org._report._dmarc" name = "froidmont.org._report._dmarc"
value = "\"v=DMARC1\"" value = "\"v=DMARC1\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "dmarc_report_falbo_txt" { resource "hetznerdns_record" "dmarc_report_falbo_txt" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "falbo.fr._report._dmarc" name = "falbo.fr._report._dmarc"
value = "\"v=DMARC1\"" value = "\"v=DMARC1\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "dkim_txt" { resource "hetznerdns_record" "dkim_txt" {
zone_id = data.hetznerdns_zone.banditlair_zone.id zone_id = data.hetznerdns_zone.banditlair_zone.id
name = "dkim._domainkey" name = "dkim._domainkey"
value = local.dkim_value value = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwDEwt+a0neFlyq7ndCj0EECUp4bsusFpL2aVzroLY5Xw9S//dYuXUp1sr/yiivS71WyNjt7tOpuonu0gGEWpc6RPyeZrzXQg+zY1k/1+cLXFMz5HmJJaAbNxK02Qn89qfk/Y3pbuJt6Y/NBQ4KVOCZQB2hCT2izVSWSkhegYTCwIDAQAB\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
data "hetznerdns_zone" "falbo_zone" { data "hetznerdns_zone" "falbo_zone" {
@ -111,58 +110,58 @@ data "hetznerdns_zone" "falbo_zone" {
resource "hetznerdns_record" "falbo_a" { resource "hetznerdns_record" "falbo_a" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "@" name = "@"
value = hetznerdns_record.banditlair_dedicated_a.value value = hetznerdns_record.banditlair_dedicated_a.value
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "falbo_cname" { resource "hetznerdns_record" "falbo_cname" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "*" name = "*"
value = "${data.hetznerdns_zone.falbo_zone.name}." value = "${data.hetznerdns_zone.falbo_zone.name}."
type = "CNAME" type = "CNAME"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "falbo_mail_mx" { resource "hetznerdns_record" "falbo_mail_mx" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "@" name = "@"
value = "12 mail.${data.hetznerdns_zone.banditlair_zone.name}." value = "12 mail.${data.hetznerdns_zone.banditlair_zone.name}."
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "falbo_mail2_mx" { resource "hetznerdns_record" "falbo_mail2_mx" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "@" name = "@"
value = "20 mail2.${data.hetznerdns_zone.banditlair_zone.name}." value = "20 mail2.${data.hetznerdns_zone.banditlair_zone.name}."
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "falbo_spf_txt" { resource "hetznerdns_record" "falbo_spf_txt" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "@" name = "@"
value = "\"v=spf1 include:${data.hetznerdns_zone.banditlair_zone.name} -all\"" value = "\"v=spf1 include:${data.hetznerdns_zone.banditlair_zone.name} -all\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "falbo_dmarc_txt" { resource "hetznerdns_record" "falbo_dmarc_txt" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "_dmarc" name = "_dmarc"
value = local.dmarc_value value = local.dmarc_value
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "falbo_dkim_txt" { resource "hetznerdns_record" "falbo_dkim_txt" {
zone_id = data.hetznerdns_zone.falbo_zone.id zone_id = data.hetznerdns_zone.falbo_zone.id
name = "dkim._domainkey" name = "dkim._domainkey"
value = local.dkim_value value = "\"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWJwmQoiaxKCp6Cj+rELeHicd7VD1l/Q5KKQURgt1wIAY36bwbFYeuN/+ULruJzbnoyJ63G2QttO4H6MLdVTgNRjTuixmoE5mZEAE/7BlyAfDS0MLUXyGbxD6WtGZPT6PQ1cxWp9jVvYUs/NypcRfpDu0J9IXX6+coQM5CMLLdRwIDAQAB\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
data "hetznerdns_zone" "froidmont_zone" { data "hetznerdns_zone" "froidmont_zone" {
@ -171,58 +170,58 @@ data "hetznerdns_zone" "froidmont_zone" {
resource "hetznerdns_record" "froidmont_a" { resource "hetznerdns_record" "froidmont_a" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "@" name = "@"
value = hetznerdns_record.banditlair_dedicated_a.value value = hetznerdns_record.banditlair_dedicated_a.value
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "froidmont_cname" { resource "hetznerdns_record" "froidmont_cname" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "*" name = "*"
value = "${data.hetznerdns_zone.froidmont_zone.name}." value = "${data.hetznerdns_zone.froidmont_zone.name}."
type = "CNAME" type = "CNAME"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "froidmont_mail_mx" { resource "hetznerdns_record" "froidmont_mail_mx" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "@" name = "@"
value = "12 mail.${data.hetznerdns_zone.banditlair_zone.name}." value = "12 mail.${data.hetznerdns_zone.banditlair_zone.name}."
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "froidmont_mail2_mx" { resource "hetznerdns_record" "froidmont_mail2_mx" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "@" name = "@"
value = "20 mail2.${data.hetznerdns_zone.banditlair_zone.name}." value = "20 mail2.${data.hetznerdns_zone.banditlair_zone.name}."
type = "MX" type = "MX"
ttl = 86400 ttl = 86400
} }
resource "hetznerdns_record" "froidmont_spf_txt" { resource "hetznerdns_record" "froidmont_spf_txt" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "@" name = "@"
value = "\"v=spf1 include:${data.hetznerdns_zone.banditlair_zone.name} -all\"" value = "\"v=spf1 include:${data.hetznerdns_zone.banditlair_zone.name} -all\""
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "froidmont_dmarc_txt" { resource "hetznerdns_record" "froidmont_dmarc_txt" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "_dmarc" name = "_dmarc"
value = local.dmarc_value value = local.dmarc_value
type = "TXT" type = "TXT"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "froidmont_dkim_txt" { resource "hetznerdns_record" "froidmont_dkim_txt" {
zone_id = data.hetznerdns_zone.froidmont_zone.id zone_id = data.hetznerdns_zone.froidmont_zone.id
name = "dkim._domainkey" 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" type = "TXT"
ttl = 600 ttl = 600
} }
data "hetznerdns_zone" "stb_zone" { data "hetznerdns_zone" "stb_zone" {
@ -231,16 +230,16 @@ data "hetznerdns_zone" "stb_zone" {
resource "hetznerdns_record" "stb_a" { resource "hetznerdns_record" "stb_a" {
zone_id = data.hetznerdns_zone.stb_zone.id zone_id = data.hetznerdns_zone.stb_zone.id
name = "@" name = "@"
value = hetznerdns_record.banditlair_dedicated_a.value value = hetznerdns_record.banditlair_dedicated_a.value
type = "A" type = "A"
ttl = 600 ttl = 600
} }
resource "hetznerdns_record" "stb_cname" { resource "hetznerdns_record" "stb_cname" {
zone_id = data.hetznerdns_zone.stb_zone.id zone_id = data.hetznerdns_zone.stb_zone.id
name = "*" name = "*"
value = "${data.hetznerdns_zone.stb_zone.name}." value = "${data.hetznerdns_zone.stb_zone.name}."
type = "CNAME" type = "CNAME"
ttl = 600 ttl = 600
} }

12
flake.lock generated
View file

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

116
flake.nix
View file

@ -1,5 +1,5 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
@ -13,60 +13,68 @@
]; ];
}; };
in in
{ {
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
nixpkgs-fmt nixpkgs-fmt
terraform_0_14 terraform
sops terraform-ls
]; sops
};
nixosConfigurations = {
db1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = common.modules ++ [
./modules/postgresql.nix
./modules/custom-backup-job.nix
({
networking.hostName = "db1";
networking.domain = "banditlair.com";
networking.firewall.interfaces."enp7s0".allowedTCPPorts = [ 5432 ];
services.custom-backup-job = {
additionalReadWritePaths = [ "/nix/var/data/postgresql" ];
additionalPreHook = ''
${pkgs.postgresql_12}/bin/pg_dump -U synapse synapse > /nix/var/data/postgresql/synapse.dmp
${pkgs.postgresql_12}/bin/pg_dump -U nextcloud nextcloud > /nix/var/data/postgresql/nextcloud.dmp
'';
startAt = "03:00";
};
})
]; ];
}; };
backend1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = common.modules ++ [
./modules/nginx.nix
./modules/murmur.nix
./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";
networking.firewall.allowedTCPPorts = [ 80 443 64738 ];
networking.firewall.allowedUDPPorts = [ 64738 ];
services.custom-backup-job = {
additionalPaths = [ "/var/lib/nextcloud/config" ];
additionalReadWritePaths = [ "/nix/var/data/murmur" ];
additionalPreHook = "cp /var/lib/murmur/murmur.sqlite /nix/var/data/murmur/murmur.sqlite";
startAt = "03:30";
};
})
];
};
};
}; nixosConfigurations = {
db1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
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 ];
services.custom-backup-job = {
additionalReadWritePaths = [ "/nix/var/data/postgresql" ];
additionalPreHook = ''
${pkgs.postgresql_12}/bin/pg_dump -U synapse synapse > /nix/var/data/postgresql/synapse.dmp
${pkgs.postgresql_12}/bin/pg_dump -U nextcloud nextcloud > /nix/var/data/postgresql/nextcloud.dmp
'';
startAt = "03:00";
};
system.stateVersion = "21.05";
}
)
];
};
backend1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = common.modules ++ [
./modules/nginx.nix
./modules/murmur.nix
./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";
networking.firewall.allowedTCPPorts = [ 80 443 64738 ];
networking.firewall.allowedUDPPorts = [ 64738 ];
services.custom-backup-job = {
additionalPaths = [ "/var/lib/nextcloud/config" ];
additionalReadWritePaths = [ "/nix/var/data/murmur" ];
additionalPreHook = "cp /var/lib/murmur/murmur.sqlite /nix/var/data/murmur/murmur.sqlite";
startAt = "03:30";
};
system.stateVersion = "21.05";
}
)
];
};
};
};
} }

10
shell.nix Normal file
View file

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