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

Reformat nix files

Browse source
This commit is contained in:
Paul-Henri Froidmont 2021-07-15 17:33:31 +02:00
parent dd5b87f66e
commit d098f4bfbf
Signed by: phfroidmont
GPG key ID: BE948AFD7E7873BE
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -11,9 +11,11 @@
./modules/openssh.nix ./modules/openssh.nix
]; ];
}; };
in { in
{
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
nixpkgs-fmt
terraform_0_14 terraform_0_14
sops sops
]; ];
@ -22,7 +24,7 @@
nixosConfigurations = { nixosConfigurations = {
db1 = nixpkgs.lib.nixosSystem { db1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = common.modules ++[ modules = common.modules ++ [
./modules/postgresql.nix ./modules/postgresql.nix
({ ({
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -36,7 +38,7 @@
}; };
backend1 = nixpkgs.lib.nixosSystem { backend1 = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = common.modules ++[ modules = common.modules ++ [
./modules/murmur.nix ./modules/murmur.nix
./modules/synapse.nix ./modules/synapse.nix
({ ({

12
modules/synapse.nix
View file

@ -3,8 +3,10 @@ let
fqdn = fqdn =
let let
join = hostName: domain: hostName + lib.optionalString (domain != null) ".${domain}"; join = hostName: domain: hostName + lib.optionalString (domain != null) ".${domain}";
in join "matrix" config.networking.domain; in
in { join "matrix" config.networking.domain;
in
{
security.acme.email = "letsencrypt.account@banditlair.com"; security.acme.email = "letsencrypt.account@banditlair.com";
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
@ -30,7 +32,8 @@ in {
# use 443 instead of the default 8448 port to unite # use 443 instead of the default 8448 port to unite
# the client-server and server-server port for simplicity # the client-server and server-server port for simplicity
server = { "m.server" = "${fqdn}:443"; }; server = { "m.server" = "${fqdn}:443"; };
in '' in
''
add_header Content-Type application/json; add_header Content-Type application/json;
return 200 '${builtins.toJSON server}'; return 200 '${builtins.toJSON server}';
''; '';
@ -41,7 +44,8 @@ in {
"m.identity_server" = { "base_url" = "https://vector.im"; }; "m.identity_server" = { "base_url" = "https://vector.im"; };
}; };
# ACAO required to allow element-web on any URL to request this json file # ACAO required to allow element-web on any URL to request this json file
in '' in
''
add_header Content-Type application/json; add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
return 200 '${builtins.toJSON client}'; return 200 '${builtins.toJSON client}';