simono41/chaos-jetzt-nixfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move prod matrix from shirley to hamilton

Browse source
This commit is contained in:
Moritz 'e1mo' Fromm 2023-08-13 12:31:14 +02:00
parent 3e278c3586
commit 3016056768
No known key found for this signature in database
GPG key ID: 1D5D79A439E787F1
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hosts/hamilton/configuration.nix
View file

@ -1,8 +1,9 @@
{ pkgs, baseDomain, ... }: { { pkgs, baseDomain, config, ... }: {
cj.deployment.environment = "prod"; cj.deployment.environment = "prod";
imports = [ imports = [
./hardware-config.nix ./hardware-config.nix
../../services/matrix
]; ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
@ -28,4 +29,13 @@
ipv6.addresses = [ { address = "2a01:4f8:1c1e:b564::1"; prefixLength = 64; } ]; ipv6.addresses = [ { address = "2a01:4f8:1c1e:b564::1"; prefixLength = 64; } ];
}; };
}; };
# This is specific to every host!
systemd.mounts = [{
what = "/dev/disk/by-id/scsi-0HC_Volume_7628580";
where = config.services.matrix-synapse.settings.media_store_path;
type = "ext4";
options = "discard,nofail,defaults";
wantedBy = [ "multi-user.target" ];
}];
} }

10
hosts/shirley/configuration.nix
View file

@ -6,7 +6,6 @@
../../services/mumble.nix ../../services/mumble.nix
../../services/website.nix ../../services/website.nix
../../services/vaultwarden.nix ../../services/vaultwarden.nix
../../services/matrix
../../services/dokuwiki.nix ../../services/dokuwiki.nix
../../services/freescout.nix ../../services/freescout.nix
../../services/hedgedoc.nix ../../services/hedgedoc.nix
@ -28,13 +27,4 @@
ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ]; ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ];
}; };
}; };
# This is specific to every host!
systemd.mounts = [{
what = "/dev/disk/by-id/scsi-0HC_Volume_7628580";
where = config.services.matrix-synapse.settings.media_store_path;
type = "ext4";
options = "discard,nofail,defaults";
wantedBy = [ "multi-user.target" ];
}];
} }

7
secrets/hamilton/secrets.yaml
View file

@ -1,4 +1,5 @@
placeholder: ENC[AES256_GCM,data:rzHtxg==,iv:cCQcC7FZJkGC1YIKNdqiTU+7W6YJ8hJlwT5XwdTyu/k=,tag:AfZlrP54Yh6U8l7bwCT3Bg==,type:bool] synapse:
registration_shared_secret: ENC[AES256_GCM,data:3mcyn8+8bfRQTJf8a6CwfO/v10W1PvM3D6POq52BV49N1KVBSs27aGq6YZFzR0H9vF5qUGXGRzk+zdNk+GK0Lw==,iv:54ZI2SGGXOQstRU0C89sJlWluC0XnxNLqrjt/ad0MzQ=,tag:gD9h+nIOz049GlaRjgX5Aw==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -14,8 +15,8 @@ sops:
aWQ2QW05a1lrbTZZci9VMldpVzNCZFkKCJwEd5TkZaIb2M1E149/NEUB1E5E8gLu aWQ2QW05a1lrbTZZci9VMldpVzNCZFkKCJwEd5TkZaIb2M1E149/NEUB1E5E8gLu
YSDnb7eKfx8auWCEVCMiHx6POdpVvwxKnxUWHEnUBIMHhx+Y1MSclg== YSDnb7eKfx8auWCEVCMiHx6POdpVvwxKnxUWHEnUBIMHhx+Y1MSclg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-08-12T08:45:36Z" lastmodified: "2023-08-13T10:27:18Z"
mac: ENC[AES256_GCM,data:pjGhTGsY7I7AF2Pd2fINT0PzJOWSF6TvE26NTC6xNwJ2fnL+opANJnLkdRpZFw7rXVqGdjvZmtYV/Z4MZTH3n5NRM9cg/sQ1kRLS6LIgGFd0xqxhCE26gArquOSqbWb7BU9vyq9A4XFqi9Jx0yjP9+ywYOjrIuVN7OHDyWsN4sU=,iv:3nSB6qNHq9HRa1YCHDGRopiArXPWob10/ON8Y7rMeKc=,tag:2FElWlRUskM+Z/DlfeAs1w==,type:str] mac: ENC[AES256_GCM,data:BL1UtpKeieAGoexQsOPqoIasANvWjsy+7AaPCeKwev3CUWtPXwwMfsmtkPlQMggEpf5iUjNH74GJBMKKU9SKWhUwxGY7ph5VVYsF0uHlsToKNBK7H8wjtu1Bm8XqRkku/cqCu8/X5ixYx9y3hdKy7UNd8gMHJOkEriA+8J/zZrE=,iv:dE7q8JkxqdnlQcYmwj404mSWLqupxBIiQzIZSAibI+U=,tag:hj2/LhROne6S7YQ4xBMKyA==,type:str]
pgp: pgp:
- created_at: "2023-08-12T09:39:58Z" - created_at: "2023-08-12T09:39:58Z"
enc: |- enc: |-