Fix dkim public key for froidmont.org

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

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 }:
let
@ -13,60 +13,68 @@
];
};
in
{
devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [
nixpkgs-fmt
terraform_0_14
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";
};
})
{
devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [
nixpkgs-fmt
terraform
terraform-ls
sops
];
};
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";
}
)
];
};
};
};
}