Merge pull request #590 from genebean/dawarich

Migrate Dawarich to the new Nixified version
This commit is contained in:
Gene Liverman 2026-01-24 18:30:04 -05:00 committed by GitHub
commit 08228c81c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 36 additions and 24 deletions

42
flake.lock generated
View file

@ -76,11 +76,11 @@
]
},
"locked": {
"lastModified": 1768727946,
"narHash": "sha256-le2GY+ZR6uRHMuOAc60sBR3gBD2BEk1qOZ3S5C/XFpU=",
"lastModified": 1768923567,
"narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=",
"owner": "nix-community",
"repo": "disko",
"rev": "558e84658d0eafc812497542ad6ca0d9654b3b0f",
"rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28",
"type": "github"
},
"original": {
@ -308,11 +308,11 @@
]
},
"locked": {
"lastModified": 1768603898,
"narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=",
"lastModified": 1768949235,
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c",
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
"type": "github"
},
"original": {
@ -331,11 +331,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1768617936,
"narHash": "sha256-WWnJR02A/f3Ck4zpYlV26hjL6IKT/Y5wsd4kw/2m0gI=",
"lastModified": 1769136830,
"narHash": "sha256-ff0J7qLtDt6oCfRz2El49Hed1maoZ+5b4cshS/RDjXA=",
"owner": "numtide",
"repo": "nix-auth",
"rev": "12c1214af739c118ce5987c6db0bffa92df56b34",
"rev": "dbea0129df759a2df58c03edda4a5ac23abe9407",
"type": "github"
},
"original": {
@ -464,11 +464,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1768736227,
"narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=",
"lastModified": 1769086393,
"narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d447553bcbc6a178618d37e61648b19e744370df",
"rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
"type": "github"
},
"original": {
@ -511,11 +511,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1768661221,
"narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=",
"lastModified": 1769237874,
"narHash": "sha256-saOixpqPT4fiE/M8EfHv9I98f3sSEvt6nhMJ/z0a7xI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3327b113f2ef698d380df83fbccefad7e83d7769",
"rev": "523257564973361cc3e55e3df3e77e68c20b0b80",
"type": "github"
},
"original": {
@ -543,11 +543,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1768621446,
"narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=",
"lastModified": 1769089682,
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "72ac591e737060deab2b86d6952babd1f896d7c5",
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
"type": "github"
},
"original": {
@ -690,11 +690,11 @@
]
},
"locked": {
"lastModified": 1768709255,
"narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=",
"lastModified": 1768863606,
"narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9",
"rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2",
"type": "github"
},
"original": {

View file

@ -56,6 +56,15 @@ in {
server_name = "collabora.pack1828.org";
};
};
dawarich = {
enable = true;
configureNginx = true;
localDomain = "location.technicalissues.us";
smtp = {
fromAddress = "location@hetznix01.technicalissues.us";
host = "127.0.0.1";
};
};
nextcloud = {
enable = true;
hostName = "cloud.pack1828.org";

View file

@ -125,9 +125,12 @@ in {
enableACME = true;
acmeRoot = null;
forceSSL = true;
locations."/" = {
proxyPass = "http://localhost:3003";
};
# Other settings come from services.dawarich.configureNginx
# The client_max_body_size setting is need to allow for large GeoJSON files
# such as those exported from a containerized version of Dawarich.
extraConfig = ''
client_max_body_size 200m;
'';
};
"matrix.${domain}" = {
listen = [