diff --git a/.gitignore b/.gitignore index 7ae5588..6d0debc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,12 +7,12 @@ !hosts/cube/ !hosts/cube/forgejo/ !hosts/cube/grafana/ -!hosts/cube/mail/ !hosts/cube/matrix/ !hosts/cube/nextcloud/ !hosts/cube/restic/ !hosts/disk/ +!hosts/disk/mail/ !hosts/enka/ diff --git a/hosts/cube/forgejo/default.nix b/hosts/cube/forgejo/default.nix index f3fd629..0c2e99d 100644 --- a/hosts/cube/forgejo/default.nix +++ b/hosts/cube/forgejo/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: with lib; +{ self, config, lib, pkgs, ... }: with lib; let inherit (config.networking) domain; @@ -8,7 +8,7 @@ let port = 8001; in systemConfiguration { secrets.forgejoMailPassword = { - file = ../mail/password.plain.age; + file = ../../disk/mail/password.plain.age; owner = "forgejo"; }; secrets.forgejoRunnerPassword = { @@ -93,7 +93,7 @@ in systemConfiguration { ENABLED = true; PROTOCOL = "smtps"; - SMTP_ADDR = config.mailserver.fqdn; + SMTP_ADDR = self.disk.mailserver.fqdn; USER = "git@${domain}"; }; diff --git a/hosts/cube/forgejo/password.runner.age b/hosts/cube/forgejo/password.runner.age index 38b1358..e219c86 100644 Binary files a/hosts/cube/forgejo/password.runner.age and b/hosts/cube/forgejo/password.runner.age differ diff --git a/hosts/cube/grafana/default.nix b/hosts/cube/grafana/default.nix index 750ebb7..271777a 100644 --- a/hosts/cube/grafana/default.nix +++ b/hosts/cube/grafana/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: with lib; +{ self, config, lib, ... }: with lib; let inherit (config.networking) domain; @@ -12,7 +12,7 @@ in systemConfiguration { owner = "grafana"; }; secrets.grafanaMailPassword = { - file = ../mail/password.plain.age; + file = ../../disk/mail/password.plain.age; owner = "grafana"; }; @@ -63,10 +63,10 @@ in systemConfiguration { password = "$__file{${config.secrets.grafanaMailPassword.path}}"; startTLS_policy = "MandatoryStartTLS"; - ehlo_identity = "contact@${domain}"; + ehlo_identity = "metrics@${domain}"; from_address = "metrics@${domain}"; from_name = "Metrics"; - host = "${config.mailserver.fqdn}:${toString config.services.postfix.relayPort}"; + host = "${self.disk.mailserver.fqdn}:${toString config.services.postfix.relayPort}"; }; }; diff --git a/hosts/cube/grafana/password.age b/hosts/cube/grafana/password.age index df2a61e..ca955db 100644 Binary files a/hosts/cube/grafana/password.age and b/hosts/cube/grafana/password.age differ diff --git a/hosts/cube/id.age b/hosts/cube/id.age index 945f26a..a91dec4 100644 Binary files a/hosts/cube/id.age and b/hosts/cube/id.age differ diff --git a/hosts/cube/mail/password.hash.age b/hosts/cube/mail/password.hash.age deleted file mode 100644 index e4c3a71..0000000 --- a/hosts/cube/mail/password.hash.age +++ /dev/null @@ -1,16 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 +rZ0Tw ROfnN1si3Rncdtcn/iahfVo5YuuLCETT0eQCpmwEmzU -eyP2n9rwdYPInONLJRQmZLiKOHOlWyO4O75L0LqoXcU --> ssh-rsa jPaU3Q -Ts4Nj/k3hYVUC1lh0a5Z3YanVTS4OL81TVGnClhw2UCmkbOmvYWyuONCNb2On+om -rp+b6jxjkyQIsRLw6Tt/elBdiBdVpTzbu3GoDlJZM/mmYJkyolYdH2bvNBIXnb6y -G2W4oygVCs0NoLas2WoAppAn8lLHp02jTlCtkVaz/0xgtBf+5ns3ccYTiDF5vsV9 -JGN1CVyD0tguPNyL5D4TDu+QAWPqaMqDtmyF7CvfM+5T4khzgPEvjAQgbp6OpmXm -z3dCVdeuwqg4SMCT8j2/lcwP9zSPQnoALj/WgvCzWHy+7ww+tN4XGw5068ViDKD9 -LHtwb5PTvoDfVvpq4TP6E0zPG7wuil5Ik/W4gfWVa5JR2II3qY/IVtIWAZWxsUvB -1P4CXB8F6Ht2gTAPjCSYsgfjvSj8UiTp26igL+m53i/18C08Lxs+Xqc27on6y0hm -7yAwCVK86f8kCRiQyJlKNEaiaPV/QFjE4M/547WL2TZqYvzOHT5790eNegxwOjpK - ---- TNDzf7KIjijlWDI/0qkdyPZNhMEhoheWEC6br9IHn8Q -z鎀,lr}|$ ssh-ed25519 +rZ0Tw VFixlr9X2FwNhyDsGAi6gjgLA9C4GCxwjNddtnaJDj4 -fVSYpYbhsBjaCAsvy5S/I/PEwLdqoLPvWDzmORtw4Js --> ssh-rsa jPaU3Q -tWcrrFr6FfhtM6PrcvuDs08r6IOPTISsnkHk+Aa8Ud5lY1QJU5j8CENFyYPHMxfY -Br595dZzt69PAUAzrxFZZ3tlup+ckm15lBjCSg5UHbQ1b7vwknHIS3jAFsBBkDE6 -WIp214CWz4dCeC/xb45bTr/hwUNXjWi1MrwfHwMScDf64hnYBwth7Un/guSgTO6O -aI97NR4X7J3EK9pnjezlaTQ6NroUfid9PS5cs7dQZfLrOKIkxtVW+cU20F7gRo3o -zwvK0hdby4hgUEF6k7ifUCRdO4S0xShTri/Yyv6nVoCFqMq/Iw6XEdR+ZNjYnU05 -G4S716jQC/xVsXwCJpQBkgKyEoZij9CjrWaSOPFBItMM0WgGGmSVZEcpVQL3hLJq -M0zdH4k5m1AKekhDityeOrOP9SjD678/AfIvsRwQz7zJtzLZ3ZsSMJPJAQPw24wb -HLBsmQ6u1igkv80r/YA3e0xsc3kFHgyo2WHEEYo69l0M+V8O0DPVr6ZXOiXFrwiw - ---- cG5tzw9uAYr55dQIw55M/vVWIAxNZlkBffvETqtpWhQ -/zkWZm,B`fUqh5n"#_ \ No newline at end of file diff --git a/hosts/cube/matrix/password.secret.age b/hosts/cube/matrix/password.secret.age index 25825b4..3d9f5be 100644 Binary files a/hosts/cube/matrix/password.secret.age and b/hosts/cube/matrix/password.secret.age differ diff --git a/hosts/cube/matrix/password.sync.age b/hosts/cube/matrix/password.sync.age index 6e16ae8..e9a0929 100644 Binary files a/hosts/cube/matrix/password.sync.age and b/hosts/cube/matrix/password.sync.age differ diff --git a/hosts/cube/nextcloud/default.nix b/hosts/cube/nextcloud/default.nix index 7259478..283b26f 100644 --- a/hosts/cube/nextcloud/default.nix +++ b/hosts/cube/nextcloud/default.nix @@ -80,7 +80,7 @@ in systemConfiguration { settings = { default_phone_region = "TR"; - mail_smtphost = "::1"; + mail_smtphost = "::1"; # FIXME: Will need to use SMTP. mail_smtpmode = "sendmail"; mail_from_address = "cloud"; }; diff --git a/hosts/cube/nextcloud/password.age b/hosts/cube/nextcloud/password.age index 5e7778d..f9e28ba 100644 --- a/hosts/cube/nextcloud/password.age +++ b/hosts/cube/nextcloud/password.age @@ -1,15 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 +rZ0Tw hg/Np9ZC+ruS4fs2mFBtVpLDQetEDDU5UUgq6ff0ZSw -5OwfED/OfF2gaWygU5mwUmo4g5TamTn5tKuDi/Slnuc +-> ssh-ed25519 +rZ0Tw IQWFzBlRcGmKOt1qjmYwNlFNIkQO0LmE8nTd3y/rB2g +VGYkMPzYIPdG863zw+GJjmZrSkGqxR3e6E6QZ6lsHNg -> ssh-rsa jPaU3Q -wSoz/n/fhqZcQNFOqvaXRQtfPpsMMunKK616xBa1WA5zS6OWYltX7x2SEaq/T9N5 -rRCg8EqJZsAlLKt5vyMQKIYzpJ6+m17sIyRoe6qTNP1Oj/+63U1uBGjdN1zgg/8h -IbU99rIq36AjJWNeJQu0JwhJP/CxmIVcdgY4zAtvKBnRbsK5joigOUISuJ1PJYto -oYMIS3XL48PDI5bD6BxW/L1t+1Z6hCiWH/iL4mogoF8/GGfB6UAXCtmGENBgCC0x -htIA5PThL7Z+imJeP+OhczwCkezteuFVjalOllboRlhLV7K1hUVSPPIhQD/JFDNa -ed/eg4BtThkbDkXfvkJDk5/oaQKi43KIQq/TNAlAmQrCuerddGT+MOzIcwICp65r -pA9WvtldfzhGP6A8VOR2hiHAXtrmLI0gMl6Yq7TTS5lXCBvKGvyKNWOUPasZKdLF -RgUH33HB/o+fNEuB3UcVrJ+IeVT50lDbK2hlV5UrufslKJWKpBvGA9bIGA0T3Fti +TbPLHJ83xlBl/m4BrFxoZwhisMJyjKVFt2xn0h9tNdipUj+Tp6rd7fxt1f1qAjAS +49s8VuaugA5oa/nTy53+BcgWCHIBaqrb9T3SeTvIk47VqoPSNoJG8WlRTJjoLSaQ +wSVymFmRA//RAaYSF2T+Tbzm/xCUFvsL3RbdXSlc1NQo1g94UQ3lCuMm6S/rWv2A +COtFbUC4RO/RpoxfG429UTEUpM+fx4sbpR+Q6sBLlwW5YSCvTj6L24nQU91otzQX +wsahkfll21f+EV1FHJ0G9vKPMzeXVC40KH8YF0Pw7+954DMYV3npg1l6tA9JCaBi +PaGzKC+pmre9cMvMOcDVJIn8kGTb0Cpxfgm/9Jtygabd8QVSYEaFifyqVEiHJcG2 +RfzCuF+rkDBaNYJTQwFqEp0JNsQR9GJXrQLJfR10zei20KWa9jWYR23IcYDWwzBE +Hc8y0OHDzskGsXgm27dWPaK5rEKegGQZYaxUtfeQSlDWTcHrQjee5vneUA+njwBx ---- in+sCqQ+aJ7k5BKPmOGtMUyvTuIdpc2+DPCCPlBVbsE -: ssh-ed25519 spFFQA H+q9QwbbRhlHhb6kUW/TH7G3dPsmbkHa0BUDHDKuXQY -JEoXwrxEVBhVU1euXi2eUtJWVdbx29WVhyVSjCKCYJw +-> ssh-ed25519 spFFQA IzcagogBUz24J5ooZtYMHq+F0dpL8zAmjFNwaFzVtDE +JtifcKwLlC9FQF/KmFcGEfymowmgWtMbt2JudfJcvZg -> ssh-rsa jPaU3Q -JN5Q6jUOU4CScuJ3TdDk+RCaD8P21UDk4Se6/88eFB8RCuxl5tGpkdhScuwkIfX2 -C3x6VIc+tRBSxWA67jm0r+VTpDC6RasYK9fvKk79UEZqax5owvHzzxBlC6gcvbco -RngT1Rs/5Xx7SP5jSYgPc+kkgK3FSp9M1z9YJBHHB1+D+oxaXK50eS28Vt3JlZFn -rbmWHYlk9p2hwgmpLcTxzop+tjGYehjE0H4Bod5bZIosE8aIilYKB3ns4aacBEcf -O1QfbLzYMCpnD6OYhfNYZsuTcKaf8RbDWIxmnXH+P9M6pS58qrea41A9bfFHQXtR -yFztfMheybQXXlSB6LGwcbIdZIMWf/SmNjdTiteehQEXDJNnxCQ8fSSjAKvN1btL -DYZWpgxHDXl/2q07MtSJ8aRoZC66Gw3h49oBHg0Gdk+HRNcE1JB0Du0uUnTj+gkD -G1l4Sb60u6wQ73vCzdovwKnPkU80DpndZoJZtZ3EXyuARoPBN2HyeMv1fz/h06Dc +czboYSAr86q0XBgdh5QlPZgsA0HP8Dgh7MUldHabEl5FAPTLv0qW/EqQZO4hPRSU +tS4cfduzlD/B/EcIlAhjzRldX7Lev01WXdId3i3nu56C0obGWIcfMibVUtBgXF/G +hMzBdDC/2c+W5coITWQBLw0+neXiek65GDP6VMrNBH01OqzmSmwmmXm0v+dpzxzY +94ZlQ7SGPp261ATI/+ACTGip9rYTf7FwQLWDXUQe58/ZB8bKYyVW6qf0C57x9YKN +d3STjEiFijOMNFT7+N2PGyaidnP2ssPVZaUIbp3/6n3rA6nkeWBXnmdQi7Rsy0HZ +xryypN9Bm4dtCVdZ6BVxOBSWLHT2BOZzBM9rbuV9Pmd7F+Jc2RatYVMxOjDHNOD6 +q6jMclAXDVkkVJo+R+Vvpe2r1GbL36KRyWuvF63kkM09H6zvjhQfYBSstQLnVaLg +Fgwv4zA5ZaD797zz2o/r09NWre+o8gEFwsI4hhAuepmyhg1hXUX+IezlU741skaV ---- y6FU1rTLKAKWOaZrB9jb5j3AoJbDU1SPfcYJkS7abSk -_ٙXan3~s!.XQmFa1PVS g}O9:?\ (T"Ƭ(`O*OȒĹf#!J \ No newline at end of file +--- MIMZQBdkxeA1JLidxa8AW/FvT9qaXukAykTLSTcbdY4 +3ʂ+ȃ.5 M) r_d."z@פwM?fSw˥%P"53 p}m]g0Rt!e^OE̪Qe \ No newline at end of file diff --git a/hosts/enka/password.orhan.age b/hosts/enka/password.orhan.age index 64e5c1a..b0f0d06 100644 --- a/hosts/enka/password.orhan.age +++ b/hosts/enka/password.orhan.age @@ -1,14 +1,14 @@ age-encryption.org/v1 -> ssh-rsa jPaU3Q -W5uxZYQpAVzMAWNz1cjSJ1HfcJc9GDcG9lE417tpaVbsvSZsetr9oMyH9l2Gzbjl -0a/T+hzQ6hrs0l2/L1k20JWAcTCPQtl6vBQdQRisuPQ2g4EnVRq8m8NYkGKVKaWa -YCDChJaxNPtgyYo0QjhMAz5bpy/b8U4KbGkCV4xYsVsYrJJfsW/bdOdxraCoNr10 -8xLd/BQQJIDpZ1dAShf+fyTP5u6mTm7cNhIHpTd+egVcg/TZX+SfHxhlfxLSYWfc -yet7XBN4SZW1pXrVRfAgg7wLdLJ8+wH2wwaB0rOXi0/Kb3+YF4Kf3dr9H6DBmIG/ -EMD/cmhIHlbP8bDOm2tivLzKOqCG18esoiR4QpI0AkWUt+K4wWTYt7kllEM+l41w -A6BrB2aqeGddSh6+a8Z3OXjTMnn2nbMpWjKJxoHwJMYtPqilEZ36kmEvOfvGeRsl -j4gZvCbJ/NqNkDjTpZIJ5V2jtQO7nuNimkQSc5F4F7qv++JRU5anAbWNR0cVhAlX +qPvt5V1GiPtd2oqnec1A8ZUVHiz0EL/5NerqjZRuZwpzPkjvt7nnf7S45gtffUzQ +YtYP9HoyG3eDcnu2+FqCWTeyTb58ZDGSWFk8gsI2/rjZQFQMjzalHvgP0Gd09RjR +mrIVLvO2Ybrpkotf27P7H1sBR4pwpZirJIvoEMY2+rMDzeG0IUJxv1ATjMP2YhrJ +il7xr4Z15g99Ty21iVaBEuxu+3BXHI3W3tZIAmXvLUnJFgZq3Oh2yx1qOkhT5kiq +AcQfwqXWEOgQRapt97VK4jxP4wq18aNXTDTQCmJiXq76NILrxpo78ZW7Jmr7vJbf +uMl+n7nu7ny33G3tALL+6AkxwrT2ObMXusQIjjb7hZUjtXOIRTEjmPH7NurXv9NC ++1dfCKM/BCL2ty4upfaL1bGoLCiU7mH2xTMjco09a4QYMUkCog9FCD0yK6tXVUIF +rTzC0pFlWlOQH4lAbiEX7jwLZt2uCZPMwb6kuCLe1DwivnirtZlTrcXIEO6NEC6Q ---- QMfPpiqyrBg+aX5FyuW7XPe5G+USHk71BB1gqvrvnxg -椬e_ΤB_)40R.{>n<Ͷeײay -%tͶƽr$Og5|J!s(c1őX \ No newline at end of file +--- wl+y9YZobP083MhKCTWH9ZdS4zmOQ86hQgSnlm59eV0 +rk%8]Di N,}ɟ +Eu?CV2,6TjNH&oLl5UDEP݀/W \ No newline at end of file diff --git a/hosts/enka/password.said.age b/hosts/enka/password.said.age index 71a5c47..af13e26 100644 Binary files a/hosts/enka/password.said.age and b/hosts/enka/password.said.age differ diff --git a/hosts/password.acme.age b/hosts/password.acme.age index 146a938..ffa6cd0 100644 Binary files a/hosts/password.acme.age and b/hosts/password.acme.age differ diff --git a/modules/ssh/config.age b/modules/ssh/config.age index 2145342..20a5d55 100644 Binary files a/modules/ssh/config.age and b/modules/ssh/config.age differ diff --git a/secrets.nix b/secrets.nix index 64116c9..bd6c7bd 100644 --- a/secrets.nix +++ b/secrets.nix @@ -7,9 +7,6 @@ in with keys; { "hosts/cube/id.age".publicKeys = [ cube enka ]; "hosts/cube/password.rgb.age".publicKeys = [ cube enka ]; - "hosts/cube/mail/password.plain.age".publicKeys = [ cube enka ]; - "hosts/cube/mail/password.hash.age".publicKeys = [ cube enka ]; - "hosts/cube/forgejo/password.runner.age".publicKeys = [ cube enka ]; "hosts/cube/grafana/password.age".publicKeys = [ cube enka ]; @@ -25,6 +22,9 @@ in with keys; { "hosts/disk/id.age".publicKeys = [ disk enka ]; "hosts/disk/password.floppy.age".publicKeys = [ disk enka ]; + "hosts/disk/mail/password.plain.age".publicKeys = [ cube disk enka ]; # TODO: Move to shared. + "hosts/disk/mail/password.hash.age".publicKeys = [ disk enka ]; + ### enka "hosts/enka/password.orhan.age".publicKeys = [ enka ]; "hosts/enka/password.said.age".publicKeys = [ enka ];