Compare commits

...
Author SHA1 Message Date
a9004bba03 chore(deps): update mtp digest to 188caf5
Some checks are pending
renovate/stability-days Updates have not met minimum release age requirement
2026-08-14 17:01:11 +03:00
40183d0266
Update stuff 2026-08-14 15:47:01 +02:00
3 changed files with 155 additions and 175 deletions

232
apps/backend/Cargo.lock generated
View file

@ -346,12 +346,6 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "const-oid"
version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
[[package]] [[package]]
name = "const-oid" name = "const-oid"
version = "0.10.2" version = "0.10.2"
@ -432,8 +426,23 @@ dependencies = [
"cfg-if", "cfg-if",
"cpufeatures 0.2.17", "cpufeatures 0.2.17",
"curve25519-dalek-derive", "curve25519-dalek-derive",
"digest 0.10.7", "fiat-crypto 0.2.9",
"fiat-crypto", "rustc_version",
"subtle",
"zeroize",
]
[[package]]
name = "curve25519-dalek"
version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
"curve25519-dalek-derive",
"digest 0.11.3",
"fiat-crypto 0.3.0",
"rustc_version", "rustc_version",
"subtle", "subtle",
"zeroize", "zeroize",
@ -456,24 +465,14 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06"
[[package]]
name = "der"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
dependencies = [
"const-oid 0.9.6",
"pem-rfc7468",
"zeroize",
]
[[package]] [[package]]
name = "der" name = "der"
version = "0.8.1" version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d" checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d"
dependencies = [ dependencies = [
"const-oid 0.10.2", "const-oid",
"pem-rfc7468",
"zeroize", "zeroize",
] ]
@ -514,7 +513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
dependencies = [ dependencies = [
"block-buffer 0.12.1", "block-buffer 0.12.1",
"const-oid 0.10.2", "const-oid",
"crypto-common 0.2.2", "crypto-common 0.2.2",
"ctutils", "ctutils",
] ]
@ -538,24 +537,25 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]] [[package]]
name = "ed25519" name = "ed25519"
version = "2.2.3" version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" checksum = "29fcf32e6c73d1079f83ab4d782de2d81620346a5f38c6237a86a22f8368980a"
dependencies = [ dependencies = [
"pkcs8 0.10.2", "pkcs8",
"signature 2.2.0", "signature",
] ]
[[package]] [[package]]
name = "ed25519-dalek" name = "ed25519-dalek"
version = "2.2.0" version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9" checksum = "6ebaa1a2bf1290ab3bfe5a7b771d050ebffab2711c19a81691c683a5144a25de"
dependencies = [ dependencies = [
"curve25519-dalek", "curve25519-dalek 5.0.0",
"ed25519", "ed25519",
"serde", "serde",
"sha2 0.10.9", "sha2",
"signature",
"subtle", "subtle",
"zeroize", "zeroize",
] ]
@ -600,6 +600,12 @@ version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
[[package]]
name = "fiat-crypto"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
[[package]] [[package]]
name = "find-msvc-tools" name = "find-msvc-tools"
version = "0.1.10" version = "0.1.10"
@ -1365,14 +1371,14 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "add6b9d92e496f16f4526d68ff29da1483aba4b119baeab8bed3b9e3544a6f3d" checksum = "add6b9d92e496f16f4526d68ff29da1483aba4b119baeab8bed3b9e3544a6f3d"
dependencies = [ dependencies = [
"const-oid 0.10.2", "const-oid",
"crypto-common 0.2.2", "crypto-common 0.2.2",
"ctutils", "ctutils",
"hybrid-array", "hybrid-array",
"module-lattice", "module-lattice",
"pkcs8 0.11.0", "pkcs8",
"shake", "shake",
"signature 3.0.0", "signature",
] ]
[[package]] [[package]]
@ -1414,8 +1420,8 @@ dependencies = [
[[package]] [[package]]
name = "mtp" name = "mtp"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"mtp-client", "mtp-client",
"mtp-codec", "mtp-codec",
@ -1429,34 +1435,35 @@ dependencies = [
[[package]] [[package]]
name = "mtp-client" name = "mtp-client"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"mtp-codec", "mtp-codec",
"mtp-common", "mtp-common",
"mtp-crypto", "mtp-crypto",
"mtp-transport", "mtp-transport",
"rand 0.10.2", "rand",
"tokio", "tokio",
] ]
[[package]] [[package]]
name = "mtp-codec" name = "mtp-codec"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.23.1",
"byteorder", "byteorder",
"mtp-common", "mtp-common",
"mtp-crypto", "mtp-crypto",
"mtp-type-map", "mtp-type-map",
"rand 0.10.2", "rand",
"thiserror 2.0.20",
] ]
[[package]] [[package]]
name = "mtp-common" name = "mtp-common"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"quinn", "quinn",
"rustls", "rustls",
@ -1466,8 +1473,8 @@ dependencies = [
[[package]] [[package]]
name = "mtp-crypto" name = "mtp-crypto"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"chacha20poly1305", "chacha20poly1305",
@ -1476,11 +1483,11 @@ dependencies = [
"hkdf", "hkdf",
"ml-dsa", "ml-dsa",
"mlkem-tls", "mlkem-tls",
"rand 0.10.2", "rand",
"rand_core 0.10.1", "rand_core 0.6.4",
"rustls", "rustls",
"serde", "serde",
"sha2 0.11.0", "sha2",
"thiserror 1.0.69", "thiserror 1.0.69",
"tokio", "tokio",
"zeroize", "zeroize",
@ -1488,14 +1495,14 @@ dependencies = [
[[package]] [[package]]
name = "mtp-host" name = "mtp-host"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"mtp-codec", "mtp-codec",
"mtp-common", "mtp-common",
"mtp-crypto", "mtp-crypto",
"mtp-transport", "mtp-transport",
"rand 0.8.7", "rand",
"tokio", "tokio",
"tracing", "tracing",
"wtransport", "wtransport",
@ -1503,26 +1510,28 @@ dependencies = [
[[package]] [[package]]
name = "mtp-transport" name = "mtp-transport"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"mtp-codec", "mtp-codec",
"mtp-common", "mtp-common",
"mtp-crypto", "mtp-crypto",
"rand",
"rcgen", "rcgen",
"rustls", "rustls",
"rustls-native-certs", "rustls-native-certs",
"sha2 0.11.0", "sha2",
"tokio", "tokio",
"tracing", "tracing",
"wtransport", "wtransport",
"zeroize",
] ]
[[package]] [[package]]
name = "mtp-type-map" name = "mtp-type-map"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"serde", "serde",
"serde_yaml", "serde_yaml",
@ -1530,8 +1539,8 @@ dependencies = [
[[package]] [[package]]
name = "mtp-webserver" name = "mtp-webserver"
version = "0.2.0" version = "0.3.0"
source = "git+https://git.methanium.net/methanium/mtp.git?rev=a692bed326dbfc8eac1a05825f4a287cbab6fd3e#a692bed326dbfc8eac1a05825f4a287cbab6fd3e" source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -1548,7 +1557,6 @@ dependencies = [
"mtp-host", "mtp-host",
"mtp-transport", "mtp-transport",
"quinn", "quinn",
"rand 0.10.2",
"rustls", "rustls",
"thiserror 2.0.20", "thiserror 2.0.20",
"tokio", "tokio",
@ -1678,9 +1686,9 @@ dependencies = [
[[package]] [[package]]
name = "pem-rfc7468" name = "pem-rfc7468"
version = "0.7.0" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" checksum = "a6305423e0e7738146434843d1694d621cce767262b2a86910beab705e4493d9"
dependencies = [ dependencies = [
"base64ct", "base64ct",
] ]
@ -1697,24 +1705,14 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
[[package]]
name = "pkcs8"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [
"der 0.7.10",
"spki 0.7.3",
]
[[package]] [[package]]
name = "pkcs8" name = "pkcs8"
version = "0.11.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7" checksum = "451913da69c775a56034ea8d9003d27ee8948e12443eae7c038ba100a4f21cb7"
dependencies = [ dependencies = [
"der 0.8.1", "der",
"spki 0.8.0", "spki",
] ]
[[package]] [[package]]
@ -1755,15 +1753,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
"zerocopy",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.107" version = "1.0.107"
@ -1805,7 +1794,7 @@ dependencies = [
"fastbloom", "fastbloom",
"getrandom 0.4.3", "getrandom 0.4.3",
"lru-slab", "lru-slab",
"rand 0.10.2", "rand",
"rand_pcg", "rand_pcg",
"ring", "ring",
"rustc-hash", "rustc-hash",
@ -1848,17 +1837,6 @@ version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "rand"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
dependencies = [
"libc",
"rand_chacha",
"rand_core 0.6.4",
]
[[package]] [[package]]
name = "rand" name = "rand"
version = "0.10.2" version = "0.10.2"
@ -1870,16 +1848,6 @@ dependencies = [
"rand_core 0.10.1", "rand_core 0.10.1",
] ]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core 0.6.4",
]
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.6.4" version = "0.6.4"
@ -2264,17 +2232,6 @@ dependencies = [
"unsafe-libyaml", "unsafe-libyaml",
] ]
[[package]]
name = "sha2"
version = "0.10.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
"cpufeatures 0.2.17",
"digest 0.10.7",
]
[[package]] [[package]]
name = "sha2" name = "sha2"
version = "0.11.0" version = "0.11.0"
@ -2332,15 +2289,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "signature"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
dependencies = [
"rand_core 0.6.4",
]
[[package]] [[package]]
name = "signature" name = "signature"
version = "3.0.0" version = "3.0.0"
@ -2395,16 +2343,6 @@ dependencies = [
"windows-sys 0.61.2", "windows-sys 0.61.2",
] ]
[[package]]
name = "spki"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
dependencies = [
"base64ct",
"der 0.7.10",
]
[[package]] [[package]]
name = "spki" name = "spki"
version = "0.8.0" version = "0.8.0"
@ -2412,7 +2350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f" checksum = "1d9efca8738c78ee9484207732f728b1ef517bbb1833d6fc0879ca898a522f6f"
dependencies = [ dependencies = [
"base64ct", "base64ct",
"der 0.8.1", "der",
] ]
[[package]] [[package]]
@ -3215,7 +3153,7 @@ dependencies = [
"rustls", "rustls",
"rustls-native-certs", "rustls-native-certs",
"rustls-pki-types", "rustls-pki-types",
"sha2 0.11.0", "sha2",
"socket2", "socket2",
"thiserror 2.0.20", "thiserror 2.0.20",
"time", "time",
@ -3244,7 +3182,7 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
dependencies = [ dependencies = [
"curve25519-dalek", "curve25519-dalek 4.1.3",
"rand_core 0.6.4", "rand_core 0.6.4",
"serde", "serde",
"zeroize", "zeroize",
@ -3302,26 +3240,6 @@ dependencies = [
"synstructure", "synstructure",
] ]
[[package]]
name = "zerocopy"
version = "0.8.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.119",
]
[[package]] [[package]]
name = "zerofrom" name = "zerofrom"
version = "0.1.8" version = "0.1.8"

View file

@ -8,7 +8,7 @@ axum = "0.8"
base64 = "0.23" base64 = "0.23"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
http = "1" http = "1"
mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "a692bed326dbfc8eac1a05825f4a287cbab6fd3e", features = ["crypto", "web-server"] } mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "188caf56cc994910bd05ea437ee45bd45d3e3027", features = ["crypto", "web-server"] }
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"

View file

@ -7,7 +7,12 @@
}; };
outputs = outputs =
{ self, nixpkgs, rust-overlay, ... }: {
self,
nixpkgs,
rust-overlay,
...
}:
let let
systems = [ systems = [
"aarch64-darwin" "aarch64-darwin"
@ -79,7 +84,7 @@
src = source; src = source;
pnpm = pkgs.pnpm; pnpm = pkgs.pnpm;
fetcherVersion = 4; fetcherVersion = 4;
hash = "sha256-x9YvkWSTYG3AULRNXdaNOnHQTtlosZGqq//jV6DPkSk="; hash = "sha256-NUWGQOodwjJTMzJtkuqoL/nWTs85jlpXIZAY4a86QEw=";
}; };
frontend = pkgs.stdenvNoCC.mkDerivation { frontend = pkgs.stdenvNoCC.mkDerivation {
pname = "methanium-status-frontend"; pname = "methanium-status-frontend";
@ -166,7 +171,12 @@
}); });
nixosModules.default = nixosModules.default =
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.services.methanium-status; cfg = config.services.methanium-status;
acmeHost = if cfg.acmeHost == null then cfg.hostName else cfg.acmeHost; acmeHost = if cfg.acmeHost == null then cfg.hostName else cfg.acmeHost;
@ -238,7 +248,9 @@
options.services.methanium-status = { options.services.methanium-status = {
enable = lib.mkEnableOption "Methanium Status monitoring and status page"; enable = lib.mkEnableOption "Methanium Status monitoring and status page";
package = lib.mkPackageOption self.packages.${pkgs.stdenv.hostPlatform.system} "backend" { }; package = lib.mkPackageOption self.packages.${pkgs.stdenv.hostPlatform.system} "backend" { };
frontendPackage = lib.mkPackageOption self.packages.${pkgs.stdenv.hostPlatform.system} "frontend" { }; frontendPackage =
lib.mkPackageOption self.packages.${pkgs.stdenv.hostPlatform.system} "frontend"
{ };
hostName = lib.mkOption { hostName = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "status.methanium.net"; default = "status.methanium.net";
@ -303,11 +315,31 @@
name = "Methanium"; name = "Methanium";
logo = ./apps/frontend/public/methanium.svg; logo = ./apps/frontend/public/methanium.svg;
services = [ services = [
{ id = "methanium-homepage"; name = "Homepage"; url = "https://methanium.net"; } {
{ id = "methanium-ui"; name = "Methanium UI"; url = "https://ui.methanium.net"; } id = "methanium-homepage";
{ id = "vector-verdict"; name = "Vector Verdict"; url = "https://vv.methanium.net"; } name = "Homepage";
{ id = "methanium-git"; name = "Git"; url = "https://git.methanium.net"; } url = "https://methanium.net";
{ id = "methanium-legal"; name = "Legal Page"; url = "https://legal.methanium.net"; } }
{
id = "methanium-ui";
name = "Methanium UI";
url = "https://ui.methanium.net";
}
{
id = "vector-verdict";
name = "Vector Verdict";
url = "https://vv.methanium.net";
}
{
id = "methanium-git";
name = "Git";
url = "https://git.methanium.net";
}
{
id = "methanium-legal";
name = "Legal Page";
url = "https://legal.methanium.net";
}
]; ];
} }
{ {
@ -315,11 +347,32 @@
name = "Tensamin"; name = "Tensamin";
logo = ./apps/frontend/public/tensamin.svg; logo = ./apps/frontend/public/tensamin.svg;
services = [ services = [
{ id = "tensamin-homepage"; name = "Homepage"; url = "https://tensamin.net"; } {
{ id = "tensamin-app"; name = "Web App"; url = "https://app.tensamin.net"; } id = "tensamin-homepage";
{ id = "tensamin-dev"; name = "Web App (Dev)"; url = "https://dev.tensamin.net"; } name = "Homepage";
{ id = "tensamin-docs"; name = "Docs"; url = "https://docs.tensamin.net"; } url = "https://tensamin.net";
{ id = "tensamin-omega"; name = "Omega"; url = "https://omega.tensamin.net"; checkHttp3 = true; } }
{
id = "tensamin-app";
name = "Web App";
url = "https://app.tensamin.net";
}
{
id = "tensamin-dev";
name = "Web App (Dev)";
url = "https://dev.tensamin.net";
}
{
id = "tensamin-docs";
name = "Docs";
url = "https://docs.tensamin.net";
}
{
id = "tensamin-omega";
name = "Omega";
url = "https://omega.tensamin.net";
checkHttp3 = true;
}
]; ];
} }
]; ];
@ -341,8 +394,14 @@
systemd.services.methanium-status = { systemd.services.methanium-status = {
description = "Methanium Status monitor"; description = "Methanium Status monitor";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" "acme-${acmeHost}.service" ]; wants = [
after = [ "network-online.target" "acme-${acmeHost}.service" ]; "network-online.target"
"acme-${acmeHost}.service"
];
after = [
"network-online.target"
"acme-${acmeHost}.service"
];
restartTriggers = [ configFile ]; restartTriggers = [ configFile ];
serviceConfig = { serviceConfig = {
User = "methanium-status"; User = "methanium-status";
@ -365,7 +424,10 @@
ProtectKernelModules = true; ProtectKernelModules = true;
ProtectKernelTunables = true; ProtectKernelTunables = true;
ProtectSystem = "strict"; ProtectSystem = "strict";
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
];
RestrictNamespaces = true; RestrictNamespaces = true;
RestrictRealtime = true; RestrictRealtime = true;
SystemCallArchitectures = "native"; SystemCallArchitectures = "native";