summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-07-10 11:51:34 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-07-10 11:51:34 +0200
commitffac1727b92167ca6847b7ae3adc71f091d8048f (patch)
tree7ff9c375782d347d6ef3da3a3d02b7e39aad3c44
parent20e7a2a2544afd682f487327aa42d1899784db98 (diff)
downloadnixos-ffac1727b92167ca6847b7ae3adc71f091d8048f.tar
nixos-ffac1727b92167ca6847b7ae3adc71f091d8048f.tar.gz
nixos-ffac1727b92167ca6847b7ae3adc71f091d8048f.tar.bz2
nixos-ffac1727b92167ca6847b7ae3adc71f091d8048f.tar.xz
nixos-ffac1727b92167ca6847b7ae3adc71f091d8048f.zip
...
Diffstat
-rw-r--r--_sources/generated.json24
-rw-r--r--_sources/generated.nix18
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad.hs2
-rw-r--r--flake.lock79
-rw-r--r--flake.nix5
-rw-r--r--gup/Gupfile2
-rw-r--r--gup/cabal2nix.gup4
-rw-r--r--hosts/sif/default.nix9
-rw-r--r--hosts/surtr/default.nix2
-rw-r--r--hosts/surtr/dns/default.nix2
-rw-r--r--hosts/surtr/dns/keys/mta-sts.bouncy.email_acme.yaml26
-rw-r--r--hosts/surtr/dns/zones/email.bouncy.soa10
-rw-r--r--hosts/surtr/email/default.nix20
-rw-r--r--hosts/surtr/http/default.nix (renamed from hosts/surtr/http.nix)58
-rw-r--r--hosts/surtr/http/webdav/default.nix96
-rw-r--r--hosts/surtr/http/webdav/py-webdav/.gitignore1
-rw-r--r--hosts/surtr/http/webdav/py-webdav/VERSION1
-rw-r--r--hosts/surtr/http/webdav/py-webdav/setup.py17
-rw-r--r--hosts/surtr/http/webdav/py-webdav/webdav/__init__.py1
-rw-r--r--hosts/surtr/http/webdav/py-webdav/webdav/webdav.py5
-rw-r--r--hosts/surtr/matrix/default.nix8
-rw-r--r--hosts/surtr/tls/tsig_keys/mta-sts.bouncy.email26
-rw-r--r--nvfetcher.toml6
23 files changed, 301 insertions, 121 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index 9e718609..c65147bb 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -56,6 +56,24 @@
56 }, 56 },
57 "version": "v0.2.10" 57 "version": "v0.2.10"
58 }, 58 },
59 "freerdp": {
60 "cargoLocks": null,
61 "extract": null,
62 "name": "freerdp",
63 "passthru": null,
64 "pinned": false,
65 "src": {
66 "deepClone": false,
67 "fetchSubmodules": false,
68 "leaveDotGit": false,
69 "name": null,
70 "rev": "7f0efb0e9f990c6b1d09e6cf30168433d02d64c0",
71 "sha256": "sha256-8I3D7RL1KEdqun+xhlj4A72j6Iqwzp8APmkD+Z+mIMw=",
72 "type": "git",
73 "url": "https://github.com/FreeRDP/FreeRDP"
74 },
75 "version": "7f0efb0e9f990c6b1d09e6cf30168433d02d64c0"
76 },
59 "lesspipe": { 77 "lesspipe": {
60 "cargoLocks": null, 78 "cargoLocks": null,
61 "extract": null, 79 "extract": null,
@@ -209,11 +227,11 @@
209 "name": null, 227 "name": null,
210 "owner": "umlaeute", 228 "owner": "umlaeute",
211 "repo": "v4l2loopback", 229 "repo": "v4l2loopback",
212 "rev": "56cca901dcf0a5cb11cc613155cfbe863d5d8421", 230 "rev": "4aadc417254bfa3b875bf0b69278ce400ce659b2",
213 "sha256": "sha256-NY9elPsoGQVGGDIe2US/HT0ES8NSmb0ohlABc0HEIP0=", 231 "sha256": "sha256-nHxIW5BmaZC6g7SElxboTcwtMDF4SCqi11MjYWsUZpo=",
214 "type": "github" 232 "type": "github"
215 }, 233 },
216 "version": "56cca901dcf0a5cb11cc613155cfbe863d5d8421" 234 "version": "4aadc417254bfa3b875bf0b69278ce400ce659b2"
217 }, 235 },
218 "xcompose": { 236 "xcompose": {
219 "cargoLocks": null, 237 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index def59267..b077edf5 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -36,6 +36,18 @@
36 sha256 = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s="; 36 sha256 = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=";
37 }); 37 });
38 }; 38 };
39 freerdp = {
40 pname = "freerdp";
41 version = "7f0efb0e9f990c6b1d09e6cf30168433d02d64c0";
42 src = fetchgit {
43 url = "https://github.com/FreeRDP/FreeRDP";
44 rev = "7f0efb0e9f990c6b1d09e6cf30168433d02d64c0";
45 fetchSubmodules = false;
46 deepClone = false;
47 leaveDotGit = false;
48 sha256 = "sha256-8I3D7RL1KEdqun+xhlj4A72j6Iqwzp8APmkD+Z+mIMw=";
49 };
50 };
39 lesspipe = { 51 lesspipe = {
40 pname = "lesspipe"; 52 pname = "lesspipe";
41 version = "2.05"; 53 version = "2.05";
@@ -122,13 +134,13 @@
122 }; 134 };
123 v4l2loopback = { 135 v4l2loopback = {
124 pname = "v4l2loopback"; 136 pname = "v4l2loopback";
125 version = "56cca901dcf0a5cb11cc613155cfbe863d5d8421"; 137 version = "4aadc417254bfa3b875bf0b69278ce400ce659b2";
126 src = fetchFromGitHub ({ 138 src = fetchFromGitHub ({
127 owner = "umlaeute"; 139 owner = "umlaeute";
128 repo = "v4l2loopback"; 140 repo = "v4l2loopback";
129 rev = "56cca901dcf0a5cb11cc613155cfbe863d5d8421"; 141 rev = "4aadc417254bfa3b875bf0b69278ce400ce659b2";
130 fetchSubmodules = true; 142 fetchSubmodules = true;
131 sha256 = "sha256-NY9elPsoGQVGGDIe2US/HT0ES8NSmb0ohlABc0HEIP0="; 143 sha256 = "sha256-nHxIW5BmaZC6g7SElxboTcwtMDF4SCqi11MjYWsUZpo=";
132 }); 144 });
133 }; 145 };
134 xcompose = { 146 xcompose = {
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index c12c590d..f96d659b 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -194,12 +194,14 @@ hostFromName h
194 , assign "comm" $ className =? "Element" 194 , assign "comm" $ className =? "Element"
195 , assign "comm" $ className =? "Rocket.Chat" 195 , assign "comm" $ className =? "Rocket.Chat"
196 , assign "comm" $ className =? "Discord" 196 , assign "comm" $ className =? "Discord"
197 , assign "comm" $ className =? "Rainbow"
197 , assign "media" $ (className =? "Alacritty" <&&> resource =? "media") 198 , assign "media" $ (className =? "Alacritty" <&&> resource =? "media")
198 , assign "monitor" $ className =? "Grafana" 199 , assign "monitor" $ className =? "Grafana"
199 , assign "monitor" $ className =? "Virt-viewer" 200 , assign "monitor" $ className =? "Virt-viewer"
200 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "htop") 201 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "htop")
201 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "monitor") 202 , assign "monitor" $ (className =? "Alacritty" <&&> resource =? "monitor")
202 , assign "monitor" $ className =? "xfreerdp" 203 , assign "monitor" $ className =? "xfreerdp"
204 , assign "monitor" $ className =? "org.remmina.Remmina"
203 , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat 205 , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat
204 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat 206 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat
205 , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat 207 , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat
diff --git a/flake.lock b/flake.lock
index 48609f3c..c5bd114c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -74,22 +74,17 @@
74 }, 74 },
75 "home-manager": { 75 "home-manager": {
76 "inputs": { 76 "inputs": {
77 "flake-compat": [
78 "flake-compat"
79 ],
80 "nixpkgs": [ 77 "nixpkgs": [
81 "nixpkgs" 78 "nixpkgs"
82 ], 79 ],
83 "nmd": "nmd",
84 "nmt": "nmt",
85 "utils": "utils_2" 80 "utils": "utils_2"
86 }, 81 },
87 "locked": { 82 "locked": {
88 "lastModified": 1655594877, 83 "lastModified": 1656367977,
89 "narHash": "sha256-AQ39Vlb6zhsJqIRz2cN923+ESBxHmeHMHoPqA80xOCE=", 84 "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
90 "owner": "nix-community", 85 "owner": "nix-community",
91 "repo": "home-manager", 86 "repo": "home-manager",
92 "rev": "5197e5df7d3a148b1ad080235f70800987bc3549", 87 "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
93 "type": "github" 88 "type": "github"
94 }, 89 },
95 "original": { 90 "original": {
@@ -110,11 +105,11 @@
110 ] 105 ]
111 }, 106 },
112 "locked": { 107 "locked": {
113 "lastModified": 1655849525, 108 "lastModified": 1656360098,
114 "narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=", 109 "narHash": "sha256-QfuZz3RK7oPPIZFC7l72BVIct/NH24hHKqcF0U1LJok=",
115 "owner": "DavHau", 110 "owner": "DavHau",
116 "repo": "mach-nix", 111 "repo": "mach-nix",
117 "rev": "552d4caa73722b262204319526f9e77f9370f702", 112 "rev": "288338000307fdd23a1fc230a6dd1d5bd4fdde53",
118 "type": "github" 113 "type": "github"
119 }, 114 },
120 "original": { 115 "original": {
@@ -126,11 +121,11 @@
126 }, 121 },
127 "nixpkgs": { 122 "nixpkgs": {
128 "locked": { 123 "locked": {
129 "lastModified": 1655630673, 124 "lastModified": 1656875529,
130 "narHash": "sha256-kYhka8nZ7hp3Pg6f21SDEcyt7aYfjIIbLlcDKRj2jhk=", 125 "narHash": "sha256-LngTxPQozuYs/FdIoFhm9a1IoL4EqAJIgVcGRhSxtMY=",
131 "owner": "NixOS", 126 "owner": "NixOS",
132 "repo": "nixpkgs", 127 "repo": "nixpkgs",
133 "rev": "baac374635d18c960df37658b0f0b59d0767d468", 128 "rev": "f09a9cdbd3afc01ac03573959560d24bf9ec607b",
134 "type": "github" 129 "type": "github"
135 }, 130 },
136 "original": { 131 "original": {
@@ -142,11 +137,11 @@
142 }, 137 },
143 "nixpkgs-21_11": { 138 "nixpkgs-21_11": {
144 "locked": { 139 "locked": {
145 "lastModified": 1655562720, 140 "lastModified": 1656782578,
146 "narHash": "sha256-OrN8DkBRZqZMzMuECuQNvSQ5gWoFBCxDvxYXjIQ/pH0=", 141 "narHash": "sha256-1eMCBEqJplPotTo/SZ/t5HU6Sf2I8qKlZi9MX7jv9fw=",
147 "owner": "NixOS", 142 "owner": "NixOS",
148 "repo": "nixpkgs", 143 "repo": "nixpkgs",
149 "rev": "27dffce7eaa9648b4a13a461e786f169a17c0889", 144 "rev": "573603b7fdb9feb0eb8efc16ee18a015c667ab1b",
150 "type": "github" 145 "type": "github"
151 }, 146 },
152 "original": { 147 "original": {
@@ -158,11 +153,11 @@
158 }, 153 },
159 "nixpkgs-22_05": { 154 "nixpkgs-22_05": {
160 "locked": { 155 "locked": {
161 "lastModified": 1655584987, 156 "lastModified": 1656782561,
162 "narHash": "sha256-YmWxPm6ctu+9nV80DtYtMfOBosNymeTpj8+Z0JTDfhU=", 157 "narHash": "sha256-sZVLNNKIcELllTHqydsckz8HBfVqxeAt51acaaQWLCw=",
163 "owner": "NixOS", 158 "owner": "NixOS",
164 "repo": "nixpkgs", 159 "repo": "nixpkgs",
165 "rev": "57622cb817210146b379adbbd036d3da0d1f367c", 160 "rev": "18038cee44aa0c3c99a2319c3c1c4d16d6612d81",
166 "type": "github" 161 "type": "github"
167 }, 162 },
168 "original": { 163 "original": {
@@ -172,38 +167,6 @@
172 "type": "github" 167 "type": "github"
173 } 168 }
174 }, 169 },
175 "nmd": {
176 "flake": false,
177 "locked": {
178 "lastModified": 1653339422,
179 "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
180 "owner": "rycee",
181 "repo": "nmd",
182 "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
183 "type": "gitlab"
184 },
185 "original": {
186 "owner": "rycee",
187 "repo": "nmd",
188 "type": "gitlab"
189 }
190 },
191 "nmt": {
192 "flake": false,
193 "locked": {
194 "lastModified": 1648075362,
195 "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
196 "owner": "rycee",
197 "repo": "nmt",
198 "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
199 "type": "gitlab"
200 },
201 "original": {
202 "owner": "rycee",
203 "repo": "nmt",
204 "type": "gitlab"
205 }
206 },
207 "nvfetcher": { 170 "nvfetcher": {
208 "inputs": { 171 "inputs": {
209 "flake-compat": [ 172 "flake-compat": [
@@ -232,11 +195,11 @@
232 "pypi-deps-db": { 195 "pypi-deps-db": {
233 "flake": false, 196 "flake": false,
234 "locked": { 197 "locked": {
235 "lastModified": 1656230916, 198 "lastModified": 1656835523,
236 "narHash": "sha256-ySccLr2XgC9kiLwt/g+tjGyf03iwnAh1Odj3EZ+mZ/o=", 199 "narHash": "sha256-FrhbCP17ewooEw9HKpvPPLHvpeMIjR/JYBvX1pl8bvM=",
237 "owner": "DavHau", 200 "owner": "DavHau",
238 "repo": "pypi-deps-db", 201 "repo": "pypi-deps-db",
239 "rev": "76e139c4fc7d8201dd1c437ba15761c982d6d4dd", 202 "rev": "d94f2eb44cb6dd5cf2ce4c50ee6dee7207edebc2",
240 "type": "github" 203 "type": "github"
241 }, 204 },
242 "original": { 205 "original": {
@@ -266,11 +229,11 @@
266 "nixpkgs-22_05": "nixpkgs-22_05" 229 "nixpkgs-22_05": "nixpkgs-22_05"
267 }, 230 },
268 "locked": { 231 "locked": {
269 "lastModified": 1655611128, 232 "lastModified": 1656820546,
270 "narHash": "sha256-+Rfr9i0UvQL0hK1npP7X1sf0Zb2C1YDff0acj0lhyWA=", 233 "narHash": "sha256-g+1URmRH75RDAzVUtVb4Ls7X8n1iocAGULtSE7JUdwU=",
271 "owner": "Mic92", 234 "owner": "Mic92",
272 "repo": "sops-nix", 235 "repo": "sops-nix",
273 "rev": "6692484ba5339b77c7e62eafcfff2263a5488fb7", 236 "rev": "85907ae7384477e447499f6e942d822d6f2998d8",
274 "type": "github" 237 "type": "github"
275 }, 238 },
276 "original": { 239 "original": {
diff --git a/flake.nix b/flake.nix
index 97fb4204..72c93162 100644
--- a/flake.nix
+++ b/flake.nix
@@ -176,10 +176,11 @@
176 }; 176 };
177 177
178 installerConfig = if pathExists ./installer.nix then "installer.nix" else (if pathExists ./installer then "installer" else null); 178 installerConfig = if pathExists ./installer.nix then "installer.nix" else (if pathExists ./installer then "installer" else null);
179 mkInstallerForSystem = system: (lib.systems.elaborate system).isLinux;
179 installers = 180 installers =
180 let mkInstallers = system: mapAttrs (mkInstaller system) (installerProfiles system); 181 let mkInstallers = system: mapAttrs (mkInstaller system) (installerProfiles system);
181 mkInstaller = system: name: {profile, output}: let mkOutput = output; in rec { config = mkNixosConfiguration [profile { config = { nixpkgs.system = system; }; }] ./. installerConfig "installer"; output = mkOutput config; }; 182 mkInstaller = system: name: {profile, output}: let mkOutput = output; in rec { config = mkNixosConfiguration [profile { config = { nixpkgs.system = system; }; }] ./. installerConfig "installer"; output = mkOutput config; };
182 in forAllSystems (system: _systemPkgs: optionalAttrs (!(isNull installerConfig)) (mkInstallers system)); 183 in forAllSystems (system: _systemPkgs: optionalAttrs (!(isNull installerConfig) && mkInstallerForSystem system) (mkInstallers system));
183 installerNixosConfigurations = listToAttrs (concatLists (mapAttrsToList (system: mapAttrsToList (profile: { config, ... }: nameValuePair ("installer-${system}-${profile}") config)) installers)); 184 installerNixosConfigurations = listToAttrs (concatLists (mapAttrsToList (system: mapAttrsToList (profile: { config, ... }: nameValuePair ("installer-${system}-${profile}") config)) installers));
184 185
185 # packages = forAllSystems (system: systemPkgs: composeManyExtensions (attrValues self.overlays) self.legacyPackages.${system} systemPkgs); 186 # packages = forAllSystems (system: systemPkgs: composeManyExtensions (attrValues self.overlays) self.legacyPackages.${system} systemPkgs);
@@ -240,5 +241,7 @@
240 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides)); 241 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides));
241 242
242 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; 243 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
244
245 expr = self.nixosConfigurations.surtr.config.systemd.services.uwsgi.serviceConfig.ExecStart;
243 }; 246 };
244} 247}
diff --git a/gup/Gupfile b/gup/Gupfile
new file mode 100644
index 00000000..0c9b6b80
--- /dev/null
+++ b/gup/Gupfile
@@ -0,0 +1,2 @@
1cabal2nix.gup:
2 hosts/surtr/email/spm/spm.nix \ No newline at end of file
diff --git a/gup/cabal2nix.gup b/gup/cabal2nix.gup
new file mode 100644
index 00000000..ce623eee
--- /dev/null
+++ b/gup/cabal2nix.gup
@@ -0,0 +1,4 @@
1#!/usr/bin/env zsh
2
3gup -u ${2:h}/package.yaml ${2:r}.cabal
4env -C ${2:h} -- nix run nixos#cabal2nix -- . > $1 \ No newline at end of file
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 3b5ef6fc..257743fd 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -54,6 +54,15 @@ in {
54 kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ]; 54 kernelParams = [ "i915.fastboot=1" "intel_pstate=no_hwp" "acpi_backlight=vendor" "thinkpad-acpi.brightness_enable=1" "quiet" ];
55 extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; 55 extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
56 kernelModules = ["v4l2loopback"]; 56 kernelModules = ["v4l2loopback"];
57 kernelPatches = [
58 { name = "edac-config";
59 patch = null;
60 extraConfig = ''
61 EDAC y
62 EDAC_IE31200 y
63 '';
64 }
65 ];
57 66
58 tmpOnTmpfs = true; 67 tmpOnTmpfs = true;
59 68
diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix
index c9ecc945..87dd27b0 100644
--- a/hosts/surtr/default.nix
+++ b/hosts/surtr/default.nix
@@ -2,7 +2,7 @@
2{ 2{
3 imports = with flake.nixosModules.systemProfiles; [ 3 imports = with flake.nixosModules.systemProfiles; [
4 qemu-guest openssh rebuild-machines zfs 4 qemu-guest openssh rebuild-machines zfs
5 ./zfs.nix ./dns ./tls ./http.nix ./bifrost ./matrix ./postgresql.nix ./prometheus ./email 5 ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql.nix ./prometheus ./email
6 ]; 6 ];
7 7
8 config = { 8 config = {
diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix
index 5b439a8f..808c56da 100644
--- a/hosts/surtr/dns/default.nix
+++ b/hosts/surtr/dns/default.nix
@@ -184,7 +184,7 @@ in {
184 addACLs = { "rheperire.org" = ["ymir_acme_acl"]; }; 184 addACLs = { "rheperire.org" = ["ymir_acme_acl"]; };
185 } 185 }
186 { domain = "bouncy.email"; 186 { domain = "bouncy.email";
187 acmeDomains = ["mailin.bouncy.email" "mailsub.bouncy.email" "imap.bouncy.email" "spm.bouncy.email" "bouncy.email"]; 187 acmeDomains = ["mailin.bouncy.email" "mailsub.bouncy.email" "imap.bouncy.email" "spm.bouncy.email" "mta-sts.bouncy.email" "bouncy.email"];
188 } 188 }
189 ]} 189 ]}
190 ''; 190 '';
diff --git a/hosts/surtr/dns/keys/mta-sts.bouncy.email_acme.yaml b/hosts/surtr/dns/keys/mta-sts.bouncy.email_acme.yaml
new file mode 100644
index 00000000..ee78810d
--- /dev/null
+++ b/hosts/surtr/dns/keys/mta-sts.bouncy.email_acme.yaml
@@ -0,0 +1,26 @@
1{
2 "data": "ENC[AES256_GCM,data:MKHoCzI9odlwPov5Ci9r2IaFCCT7DhOB8EJIFNdgG8xLwdk67SkTQ3kMGXM52EDPWdZ6a90HyKVDgL3O2vl8wbRu49jAIxCYr4t3QhLserNpMikxvAqItivtJKvBL0ah8B4mbjEH1KLou8DZgpDPdL8s+MxTOuYuLBvu/LPGRyabhKVSXmSRIL1iYx7RShe6r2PxiHN6wPmISj9YcwuuWygQRxkEqpybjUQzJe8tYFzuJ19rIUCZ26hI+k3khtFVET4TnouQAdTYXx6I/t/8Q8P7oILPFq4c,iv:w85RawhDWoLtTpWcbHo8W7bXCMa6apQNa4pQLd/whZc=,tag:z3WELFieEDeP9Zrna5brfQ==,type:str]",
3 "sops": {
4 "kms": null,
5 "gcp_kms": null,
6 "azure_kv": null,
7 "hc_vault": null,
8 "age": null,
9 "lastmodified": "2022-07-10T09:38:55Z",
10 "mac": "ENC[AES256_GCM,data:w2Ir2YQgkH0+5jNFW7mHyFVW2VEh98ADI99v6e55U7jKdEn70oF8cv787kMHNqpbwYamO9pSAz14is5Po+n11MH0UxESuU0cE7tfvoaUDIDgHNFVENB9dlKrKmnzXyEbN0+p33EP+/QmKYu4yLGc8t33NqoeD7Mc2McnmXJUvm0=,iv:7N480RaBLjIBXWJZG76VzIEyxm2eIxOi9GoZbGm2H50=,tag:JceWZoMQMwqxTYBRMPRnzA==,type:str]",
11 "pgp": [
12 {
13 "created_at": "2022-07-10T09:38:54Z",
14 "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyFKFNkTVG5oSAQdAYwPoDNsPVr3pUAih0sMWoebzWi8KQk6nthYKrBvc5mAw\nnuAjBhLc6Tzr8/vf5JbYcPiopd4qgIbPwqW8KAK28EdAz1+VrfM/mpI3wy0lO2YT\n0l4BQBjlvteoUfgV3nYDVbma7hh78Ip7vn0ebzeYCXbGqfCmhZXuZVG9k9rQ+v5t\nenIL1aLxLOBZSbcuDF415MZvKndU5LoQdciVfsFrex8TVzrYKQ62dBr00uysEgTz\n=TPo8\n-----END PGP MESSAGE-----\n",
15 "fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8"
16 },
17 {
18 "created_at": "2022-07-10T09:38:54Z",
19 "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAxFqsAJsqWvEmwQiLdSmcVP29dwQF9uLgGCwQCTtjuQYw\njFRrmwCYoCAMM0J7jExm6h7bVwy3pyGeIuya8X1sf6ZRJczGXvGwByK16kVdfgN2\n0l4BAlEaxS/5F6pMNJ0TMdYBMMGJWEa4H0xSE8DkF4Ep5bdxjaY3Pz09m8HWzJRA\nelshtXB8QcFLRG9BQRcPYd4ZEM+HqUCWF1C+7hBJ2SytDSHNZlXtxfd7ey3Jxg8+\n=oqf0\n-----END PGP MESSAGE-----\n",
20 "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51"
21 }
22 ],
23 "unencrypted_suffix": "_unencrypted",
24 "version": "3.7.3"
25 }
26} \ No newline at end of file
diff --git a/hosts/surtr/dns/zones/email.bouncy.soa b/hosts/surtr/dns/zones/email.bouncy.soa
index 77acee8b..271a061e 100644
--- a/hosts/surtr/dns/zones/email.bouncy.soa
+++ b/hosts/surtr/dns/zones/email.bouncy.soa
@@ -1,7 +1,7 @@
1$ORIGIN bouncy.email. 1$ORIGIN bouncy.email.
2$TTL 3600 2$TTL 3600
3@ IN SOA ns.yggdrasil.li. root.yggdrasil.li. ( 3@ IN SOA ns.yggdrasil.li. root.yggdrasil.li. (
4 2022051500 ; serial 4 2022071000 ; serial
5 10800 ; refresh 5 10800 ; refresh
6 3600 ; retry 6 3600 ; retry
7 604800 ; expire 7 604800 ; expire
@@ -63,3 +63,11 @@ spm IN AAAA 2a03:4000:52:ada::
63spm IN MX 0 mailin.bouncy.email. 63spm IN MX 0 mailin.bouncy.email.
64spm IN TXT "v=spf1 redirect=bouncy.email" 64spm IN TXT "v=spf1 redirect=bouncy.email"
65_acme-challenge.spm IN NS ns.yggdrasil.li. 65_acme-challenge.spm IN NS ns.yggdrasil.li.
66
67_mta-sts IN TXT "v=STSv1; id=2022071000"
68_smtp._tls IN TXT "v=TLSRPTv1; rua=mailto:postmaster@bouncy.email"
69mta-sts IN A 202.61.241.61
70mta-sts IN AAAA 2a03:4000:52:ada::
71mta-sts IN MX 0 mailin.bouncy.email.
72mta-sts IN TXT "v=spf1 redirect=bouncy.email"
73_acme-challenge.mta-sts IN NS ns.yggdrasil.li.
diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix
index b952070b..e3437a6b 100644
--- a/hosts/surtr/email/default.nix
+++ b/hosts/surtr/email/default.nix
@@ -580,6 +580,7 @@ in {
580 "mailin.bouncy.email" = {}; 580 "mailin.bouncy.email" = {};
581 "mailsub.bouncy.email" = {}; 581 "mailsub.bouncy.email" = {};
582 "imap.bouncy.email" = {}; 582 "imap.bouncy.email" = {};
583 "mta-sts.bouncy.email" = {};
583 "surtr.yggdrasil.li" = {}; 584 "surtr.yggdrasil.li" = {};
584 } // listToAttrs (map (domain: nameValuePair "spm.${domain}" {}) spmDomains); 585 } // listToAttrs (map (domain: nameValuePair "spm.${domain}" {}) spmDomains);
585 586
@@ -637,13 +638,28 @@ in {
637 proxy_set_header SPM-DOMAIN "${domain}"; 638 proxy_set_header SPM-DOMAIN "${domain}";
638 ''; 639 '';
639 }; 640 };
640 }) spmDomains); 641 }) spmDomains) // {
642 "mta-sts.bouncy.email" = {
643 locations."/".root = pkgs.runCommand "mta-sts" {} ''
644 mkdir -p $out/.well-known
645 cp ${pkgs.writeText "mta-sts.txt" ''
646 version: STSv1
647 mode: testing
648 mx: mailin.bouncy.email
649 max_age: 604800
650 ''} $out/.well-known/mta-sts.txt
651 '';
652 };
653 };
641 }; 654 };
642 655
643 systemd.services.nginx.serviceConfig.LoadCredential = concatMap (domain: [ 656 systemd.services.nginx.serviceConfig.LoadCredential = concatMap (domain: [
644 "spm.${domain}.key.pem:${config.security.acme.certs."spm.${domain}".directory}/key.pem" 657 "spm.${domain}.key.pem:${config.security.acme.certs."spm.${domain}".directory}/key.pem"
645 "spm.${domain}.pem:${config.security.acme.certs."spm.${domain}".directory}/fullchain.pem" 658 "spm.${domain}.pem:${config.security.acme.certs."spm.${domain}".directory}/fullchain.pem"
646 ]) spmDomains; 659 ]) spmDomains ++ [
660 "mta-sts.bouncy.email.key.pem:${config.security.acme.certs."mta-sts.bouncy.email".directory}/key.pem"
661 "mta-sts.bouncy.email.pem:${config.security.acme.certs."mta-sts.bouncy.email".directory}/fullchain.pem"
662 ];
647 663
648 systemd.services.spm = { 664 systemd.services.spm = {
649 serviceConfig = { 665 serviceConfig = {
diff --git a/hosts/surtr/http.nix b/hosts/surtr/http/default.nix
index af27f178..a77252ff 100644
--- a/hosts/surtr/http.nix
+++ b/hosts/surtr/http/default.nix
@@ -1,13 +1,10 @@
1{ config, lib, pkgs, ... }: 1{ config, lib, pkgs, ... }:
2{ 2{
3 imports = [
4 ./webdav
5 ];
6
3 config = { 7 config = {
4 security.pam.services."webdav".text = ''
5 auth requisite pam_succeed_if.so user ingroup webdav quiet_success
6 auth required pam_unix.so likeauth nullok nodelay quiet
7 account sufficient pam_unix.so quiet
8 '';
9 users.groups."webdav" = {};
10
11 services.nginx = { 8 services.nginx = {
12 enable = true; 9 enable = true;
13 # package = pkgs.nginxQuic; 10 # package = pkgs.nginxQuic;
@@ -30,50 +27,12 @@
30 client_body_temp_path /run/nginx-client-bodies; 27 client_body_temp_path /run/nginx-client-bodies;
31 ''; 28 '';
32 additionalModules = with pkgs.nginxModules; [ dav pam ]; 29 additionalModules = with pkgs.nginxModules; [ dav pam ];
33 virtualHosts = {
34 "webdav.141.li" = {
35 forceSSL = true;
36 sslCertificate = "/run/credentials/nginx.service/webdav.141.li.pem";
37 sslCertificateKey = "/run/credentials/nginx.service/webdav.141.li.key.pem";
38 sslTrustedCertificate = "/run/credentials/nginx.service/webdav.141.li.chain.pem";
39 locations."/".extraConfig = ''
40 root /srv/files/$remote_user;
41
42 auth_pam "WebDAV";
43 auth_pam_service_name "webdav";
44 '';
45 extraConfig = ''
46 dav_methods PUT DELETE MKCOL COPY MOVE;
47 dav_ext_methods PROPFIND OPTIONS;
48 dav_access user:rw;
49 autoindex on;
50
51 client_max_body_size 0;
52 create_full_put_path on;
53
54 add_header Strict-Transport-Security "max-age=63072000" always;
55 '';
56 };
57 };
58 };
59 security.acme.domains."webdav.141.li" = {
60 zone = "141.li";
61 certCfg = {
62 postRun = ''
63 ${pkgs.systemd}/bin/systemctl try-restart nginx.service
64 '';
65 };
66 }; 30 };
67 systemd.services.nginx = { 31 systemd.services.nginx = {
68 preStart = lib.mkForce config.services.nginx.preStart; 32 preStart = lib.mkForce config.services.nginx.preStart;
69 serviceConfig = { 33 serviceConfig = {
70 SupplementaryGroups = [ "shadow" ]; 34 SupplementaryGroups = [ "shadow" ];
71 ExecReload = lib.mkForce "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; 35 ExecReload = lib.mkForce "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
72 LoadCredential = [
73 "webdav.141.li.key.pem:${config.security.acme.certs."webdav.141.li".directory}/key.pem"
74 "webdav.141.li.pem:${config.security.acme.certs."webdav.141.li".directory}/fullchain.pem"
75 "webdav.141.li.chain.pem:${config.security.acme.certs."webdav.141.li".directory}/chain.pem"
76 ];
77 RuntimeDirectory = lib.mkForce [ "nginx" "nginx-client-bodies" ]; 36 RuntimeDirectory = lib.mkForce [ "nginx" "nginx-client-bodies" ];
78 RuntimeDirectoryMode = "0750"; 37 RuntimeDirectoryMode = "0750";
79 38
@@ -95,5 +54,14 @@
95 ReadWritePaths = [ "/srv/files" ]; 54 ReadWritePaths = [ "/srv/files" ];
96 }; 55 };
97 }; 56 };
57
58 services.uwsgi = {
59 enable = true;
60 plugins = ["python3"];
61 instance = {
62 type = "emperor";
63 vassals = {};
64 };
65 };
98 }; 66 };
99} 67}
diff --git a/hosts/surtr/http/webdav/default.nix b/hosts/surtr/http/webdav/default.nix
new file mode 100644
index 00000000..f0aec1e9
--- /dev/null
+++ b/hosts/surtr/http/webdav/default.nix
@@ -0,0 +1,96 @@
1{ config, libs, pkgs, flakeInputs, ... }:
2let
3 webdavSocket = config.services.uwsgi.runDir + "/webdav.sock";
4
5 webdavApp = flakeInputs.mach-nix.lib.${config.nixpkgs.system}.buildPythonPackage {
6 ignoreDataOutdated = true;
7 pname = "py-webdav";
8 version = builtins.readFile ./py-webdav/VERSION;
9 src = ./py-webdav;
10 python = "python3";
11 requirements = ''
12 PyNaCl ==1.5.*
13 psycopg ==3.0.*
14 WsgiDAV ==4.0.*
15 '';
16 };
17in {
18 config = {
19 security.pam.services."webdav".text = ''
20 auth requisite pam_succeed_if.so user ingroup webdav quiet_success
21 auth required pam_unix.so likeauth nullok nodelay quiet
22 account sufficient pam_unix.so quiet
23 '';
24 users.groups."webdav" = {};
25
26 services.nginx = {
27 upstreams."py-webdav" = {
28 servers = {
29 "unix://${webdavSocket}" = {};
30 };
31 };
32
33 virtualHosts."webdav.141.li" = {
34 forceSSL = true;
35 sslCertificate = "/run/credentials/nginx.service/webdav.141.li.pem";
36 sslCertificateKey = "/run/credentials/nginx.service/webdav.141.li.key.pem";
37 sslTrustedCertificate = "/run/credentials/nginx.service/webdav.141.li.chain.pem";
38 locations = {
39 "/".extraConfig = ''
40 root /srv/files/$remote_user;
41
42 auth_pam "WebDAV";
43 auth_pam_service_name "webdav";
44 '';
45
46 "/py/".extraConfig = ''
47 rewrite ^/py(.*) $1 break;
48
49 include ${config.services.nginx.package}/conf/uwsgi_params;
50 uwsgi_param SCRIPT_NAME /py;
51 uwsgi_pass py-webdav;
52 '';
53 };
54 extraConfig = ''
55 dav_methods PUT DELETE MKCOL COPY MOVE;
56 dav_ext_methods PROPFIND OPTIONS;
57 dav_access user:rw;
58 autoindex on;
59
60 client_max_body_size 0;
61 create_full_put_path on;
62
63 add_header Strict-Transport-Security "max-age=63072000" always;
64 '';
65 };
66 };
67 security.acme.domains."webdav.141.li" = {
68 certCfg = {
69 postRun = ''
70 ${pkgs.systemd}/bin/systemctl try-restart nginx.service
71 '';
72 };
73 };
74
75 systemd.services.nginx.serviceConfig.LoadCredential = [
76 "webdav.141.li.key.pem:${config.security.acme.certs."webdav.141.li".directory}/key.pem"
77 "webdav.141.li.pem:${config.security.acme.certs."webdav.141.li".directory}/fullchain.pem"
78 "webdav.141.li.chain.pem:${config.security.acme.certs."webdav.141.li".directory}/chain.pem"
79 ];
80
81
82 services.uwsgi.instance.vassals.webdav = {
83 type = "normal";
84 socket = webdavSocket;
85 listen = 1024;
86 master = true;
87 vacuum = true;
88 chown-socket = "${config.services.nginx.user}:${config.services.uwsgi.group}";
89
90 plugins = ["python3"];
91 pythonPackages = self: [webdavApp];
92 module = "webdav";
93 callable = "app";
94 };
95 };
96}
diff --git a/hosts/surtr/http/webdav/py-webdav/.gitignore b/hosts/surtr/http/webdav/py-webdav/.gitignore
new file mode 100644
index 00000000..ed8ebf58
--- /dev/null
+++ b/hosts/surtr/http/webdav/py-webdav/.gitignore
@@ -0,0 +1 @@
__pycache__ \ No newline at end of file
diff --git a/hosts/surtr/http/webdav/py-webdav/VERSION b/hosts/surtr/http/webdav/py-webdav/VERSION
new file mode 100644
index 00000000..6e8bf73a
--- /dev/null
+++ b/hosts/surtr/http/webdav/py-webdav/VERSION
@@ -0,0 +1 @@
0.1.0
diff --git a/hosts/surtr/http/webdav/py-webdav/setup.py b/hosts/surtr/http/webdav/py-webdav/setup.py
new file mode 100644
index 00000000..dbe345c1
--- /dev/null
+++ b/hosts/surtr/http/webdav/py-webdav/setup.py
@@ -0,0 +1,17 @@
1import setuptools
2
3with open('VERSION', 'r', encoding='utf-8') as version_file:
4 version = version_file.read().strip()
5
6setuptools.setup(
7 name="py-webdav",
8 version=version,
9 package_dir={"": "."},
10 packages=setuptools.find_packages(),
11 python_requires=">=3.8",
12 install_requires=[
13 "PyNaCl ==1.5.*",
14 "psycopg ==3.0.*",
15 "WsgiDAV ==4.0.*",
16 ],
17)
diff --git a/hosts/surtr/http/webdav/py-webdav/webdav/__init__.py b/hosts/surtr/http/webdav/py-webdav/webdav/__init__.py
new file mode 100644
index 00000000..398378e2
--- /dev/null
+++ b/hosts/surtr/http/webdav/py-webdav/webdav/__init__.py
@@ -0,0 +1 @@
from .webdav import app
diff --git a/hosts/surtr/http/webdav/py-webdav/webdav/webdav.py b/hosts/surtr/http/webdav/py-webdav/webdav/webdav.py
new file mode 100644
index 00000000..783f5d82
--- /dev/null
+++ b/hosts/surtr/http/webdav/py-webdav/webdav/webdav.py
@@ -0,0 +1,5 @@
1def app(env, start_response):
2 start_response('200 Success', [('Content-Type', 'text/plain; charset=utf-8')])
3 return [ bytes(f'{key}: {value}\n', 'utf8')
4 for key, value in env.items()
5 ]
diff --git a/hosts/surtr/matrix/default.nix b/hosts/surtr/matrix/default.nix
index 9c9c3565..a469be69 100644
--- a/hosts/surtr/matrix/default.nix
+++ b/hosts/surtr/matrix/default.nix
@@ -140,11 +140,9 @@ with lib;
140 services.nginx = { 140 services.nginx = {
141 recommendedProxySettings = true; 141 recommendedProxySettings = true;
142 142
143 upstreams = { 143 upstreams."matrix-synapse" = {
144 "matrix-synapse" = { 144 servers = {
145 servers = { 145 "127.0.0.1:8008" = {};
146 "127.0.0.1:8008" = {};
147 };
148 }; 146 };
149 }; 147 };
150 148
diff --git a/hosts/surtr/tls/tsig_keys/mta-sts.bouncy.email b/hosts/surtr/tls/tsig_keys/mta-sts.bouncy.email
new file mode 100644
index 00000000..ce10db57
--- /dev/null
+++ b/hosts/surtr/tls/tsig_keys/mta-sts.bouncy.email
@@ -0,0 +1,26 @@
1{
2 "data": "ENC[AES256_GCM,data:v0QhyJhcbR+ouKYAxvTYWltoA7vmltvb8oTYs0vecTVMx2j2+UkAjw8xJ4qD,iv:007nDkrj4kvYJMa+W3YysDOXws9UZspC3w5vaTGI/II=,tag:Gzpj7bubRknVBNOfQYvoYg==,type:str]",
3 "sops": {
4 "kms": null,
5 "gcp_kms": null,
6 "azure_kv": null,
7 "hc_vault": null,
8 "age": null,
9 "lastmodified": "2022-07-10T09:39:02Z",
10 "mac": "ENC[AES256_GCM,data:7dvWXtZd++BwWH6Qaw0WzRhxVVT9U8PFyE9MJ1E/NssSfkAZHaxDpV1kgRaHJav4lIjvUq83oWxBkEcnasfg6zF12xawxbCckf597r3ctndGtyyHLk0b0xBciiJRR8rFKeB81nKTiDzEA7ydfgbkPIktB/4xgi4vke5WHWPQ2Xs=,iv:NTTWRPUFvhDL5KndTwPEB4c3NCw6X9nDdWVPcowVN+Y=,tag:BO+TEaTY0RvptmlF9yhQfQ==,type:str]",
11 "pgp": [
12 {
13 "created_at": "2022-07-10T09:39:02Z",
14 "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyFKFNkTVG5oSAQdA1eY+DFYwuexG+2C53SzO1qsn60d1UOeBgeBojLbKwSQw\n55k9cM4vYE50bRrnqEfEXn45u2qYj4NIl2WhfJ4luwvNcmLmqvQCKDOKblOEe6Qi\n0l4B6zMGpHNTSkbaKB/Y2zRpczJxRBJz/cEuimbHs57nMQKpFGst5tMvsGilq4tq\nE8iC77K6S+OFJmJulJ/Rw4Yrg+raZ0KkpVKo+hOOKEi2QaWdBLf6dL+NdH2Qpxqu\n=iJRT\n-----END PGP MESSAGE-----\n",
15 "fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8"
16 },
17 {
18 "created_at": "2022-07-10T09:39:02Z",
19 "enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAMl+sivtfp0HDutQ2ENSGsoqeIG1//4F0TrmX3GlFVysw\nSA3Env4jdFAtHplG9/6J6PTtnRZNvnqlwoq3Gz1kEIdf8DhQP7/8uPzi2mJz916n\n0l4BOuQfwtJn/M6a7T4xWW4fPh/CgTD8e0TNV4lYboW/YwAhCgOSaRKnObMzGquR\nJ6Fx6q7+y2Be3zpHdOMHpQ1OmEVmysLRo4DeuV6WYDqSOqSklNMVi6D9b+KIQAJo\n=jbRk\n-----END PGP MESSAGE-----\n",
20 "fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51"
21 }
22 ],
23 "unencrypted_suffix": "_unencrypted",
24 "version": "3.7.3"
25 }
26} \ No newline at end of file
diff --git a/nvfetcher.toml b/nvfetcher.toml
index bc3095ca..c723654e 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -53,4 +53,8 @@ fetch.github = "po5/chapterskip"
53[lesspipe] 53[lesspipe]
54src.github = "wofr06/lesspipe" 54src.github = "wofr06/lesspipe"
55src.prefix = "v" 55src.prefix = "v"
56fetch.url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v$ver.tar.gz" \ No newline at end of file 56fetch.url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v$ver.tar.gz"
57
58[freerdp]
59src.git = "https://github.com/FreeRDP/FreeRDP"
60fetch.git = "https://github.com/FreeRDP/FreeRDP" \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 09:48:22 +0000