From 8e1c4e5982144c277da60bbadc5ff3cd2b4db5d3 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Fri, 12 Aug 2022 14:54:35 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/b9139aa9a98830ceb268a611495dc47e6b503ac4' (2022-08-10) → 'github:nix-community/emacs-overlay/8a7c1d3582856a2e34942cc4371718ef252784ac' (2022-08-12) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/3975d5158f00accda15a11180b2c08654cfb2807' (2022-08-09) → 'github:NixOS/nixos-hardware/78f56d8ec2c67a1f80f2de649ca9aadc284f65b6' (2022-08-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/490f6174c03132bf8f078d0f3a6e5890a47f9b30' (2022-08-09) → 'github:NixOS/nixpkgs/45c9736ed69800a6ff2164fb4538c9e40dad25d6' (2022-08-11) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/39d7f929fbcb1446ad7aa7441b04fb30625a4190' (2022-08-08) → 'github:NixOS/nixpkgs/3a11db5f408095b8f08b098ec2066947f4b72ce2' (2022-08-10) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 38970a3..f3dc4ba 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1660102288, - "narHash": "sha256-KclyXcLTw6Adb8TYAWdQAFi/HH+P1OHSGb/HEuuBxCc=", + "lastModified": 1660301723, + "narHash": "sha256-Mt1W+1dBmqmn2dMpqmutG0yrAo+11Ddo9YIcDscoUvE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b9139aa9a98830ceb268a611495dc47e6b503ac4", + "rev": "8a7c1d3582856a2e34942cc4371718ef252784ac", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1660030916, - "narHash": "sha256-KeVTmST6vAS85uUaSYlzv6OWhveawfIGhqX1SMq+L30=", + "lastModified": 1660291411, + "narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3975d5158f00accda15a11180b2c08654cfb2807", + "rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1659981942, - "narHash": "sha256-uCFiP/B/NXOWzhN6TKfMbSxtVMk1bVnCrnJRjCF6RmU=", + "lastModified": 1660162369, + "narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "39d7f929fbcb1446ad7aa7441b04fb30625a4190", + "rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2", "type": "github" }, "original": { @@ -323,11 +323,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1660033036, - "narHash": "sha256-GjwzXmdN5SVTT0RIZ11uDTQxaHLTLt9/AbBeIHNfidQ=", + "lastModified": 1660215038, + "narHash": "sha256-tqMyd5QB4MZh59wMHXqpro4hkKjz9ubQxkxFSuCuBGE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "490f6174c03132bf8f078d0f3a6e5890a47f9b30", + "rev": "45c9736ed69800a6ff2164fb4538c9e40dad25d6", "type": "github" }, "original": { From 6631525172d623bf46ba5cde351f0b6bd47ba68f Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Sat, 13 Aug 2022 11:40:58 +0200 Subject: [PATCH 2/3] Add printer email --- modules/server/smailserver.nix | 9 +++++++++ secrets/server.yaml | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/server/smailserver.nix b/modules/server/smailserver.nix index 7fb2c45..1999625 100644 --- a/modules/server/smailserver.nix +++ b/modules/server/smailserver.nix @@ -16,6 +16,10 @@ with lib;{ aliases = [ "stefan@ellmauthaler.net" "postmaster@ellmauthaler.net" "abuse@ellmauthaler.net" ]; hashedPasswordFile = config.sops.secrets.ellmauMail.path; }; + + "printer@ellmauthaler.net" = { + hashedPasswordFile = config.sops.secrets.printerMail.path; + }; }; localDnsResolver = false; @@ -30,6 +34,11 @@ with lib;{ group = config.mailserver.vmailGroupName; sopsFile = ../../secrets/server.yaml; }; + printerMail = { + owner = config.mailserver.vmailUserName; + group = config.mailserver.vmailGroupName; + sopsFile = ../../secrets/server.yaml; + }; }; }; } diff --git a/secrets/server.yaml b/secrets/server.yaml index b2ffc5a..da0075f 100644 --- a/secrets/server.yaml +++ b/secrets/server.yaml @@ -1,14 +1,15 @@ storemin: ENC[AES256_GCM,data:oCFpGrb+fLkVuHPgUkVi5MFbnCJiJyT4Vac6keNU,iv:5HS/xlS+sHCyRcn8ImpzbRmwpjZicq1U5C3fiuKoclY=,tag:6wbXHzDt9MApTzyIyss+qQ==,type:str] cloudstore_user: ENC[AES256_GCM,data:Ist58mJGxnvQA8xQ9s4SBC+3cGnQKqAm/g7nbmv5,iv:2DG0iR6trxoDmc2dxAVo0DAauzAaQc4MLmifii4MuXQ=,tag:jkpcZtX7gwr6fG0qd1+Y9w==,type:str] ellmauMail: ENC[AES256_GCM,data:xDLWpqkcsMEnG4CLbxLXJw4C0FdSevTWVhgLR9zm/C+ZMasvcGhaoVLSp1JKBOev1jhAYWL9f5wotF1u,iv:UV4XSZodySDgV4cNDP414WJBAFSgobovqFp72VGIT94=,tag:UMnv1G9OSju+/ZeRz4W2lw==,type:str] +printerMail: ENC[AES256_GCM,data:5g6gUeU4TQu9EV6L7vYRUWACOW58f9CNz/cnaisGYX0Swfo9tkKhBm+6Sds4H7woFvVxHR+dJfoefYZc,iv:1OivNWwFAO7VMvvJGxi5+nSWyStVPSQBn9f0XwN7KO0=,tag:HNh8b+83wraQIIiq97GVGQ==,type:str] sops: kms: [] gcp_kms: [] azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-08-07T11:58:41Z" - mac: ENC[AES256_GCM,data:cnPMyFHsoTpvNb+fOcR+Jillp5eFmSKUzMcKS3YAQY9bO8NYvKPG9mE3B824fB70oPVR4od4DgRTh2sBoa7b9+h19VvL1vWAVWsTzTEOXJttIfISutt8BwoY/k1+BEuuBH5msi4f9i2q92DC5bxpawLHdSnnYzckbtdiL0n8Y38=,iv:m/HCxp47ZX0vDBKQDUT/ZVXagwjfZIzxQ0g/4Yd/4D8=,tag:n02+CNiSiDKNwHQfyy8X+Q==,type:str] + lastmodified: "2022-08-13T09:38:54Z" + mac: ENC[AES256_GCM,data:cfFKA+laXhnlrDkQAus9fUQesR27UDflL3U9OFOE4MMXv6dWn2mANX0PyvWqJa3YigAkmpxhaaazusEedz+fl5y0k27pI1P284sELM7Tnb20OcnkWEH79v94qek2xrWLXNiTj5l6k4y+SVPeNoFeelGCVEApp/tQl2fKmtlWIdc=,iv:TtbBU6CwFPuyq25qcYq5aXBqCx8nJ85qh+dmgm3kNOI=,tag:NyNsSpNCLzRJqTajmbrkeQ==,type:str] pgp: - created_at: "2022-07-31T12:48:30Z" enc: | From 4a0a047e6a5d27dc9843a68c918c0ffb8741c1a3 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Tue, 16 Aug 2022 15:58:46 +0200 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/8a7c1d3582856a2e34942cc4371718ef252784ac' (2022-08-12) → 'github:nix-community/emacs-overlay/b7f322524d077b01f63d413cea4059c5fffaa362' (2022-08-16) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/78f56d8ec2c67a1f80f2de649ca9aadc284f65b6' (2022-08-12) → 'github:NixOS/nixos-hardware/12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1' (2022-08-13) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/45c9736ed69800a6ff2164fb4538c9e40dad25d6' (2022-08-11) → 'github:NixOS/nixpkgs/879121648fe522b38cc1cf75aef160a14a1f2e7b' (2022-08-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/3a11db5f408095b8f08b098ec2066947f4b72ce2' (2022-08-10) → 'github:NixOS/nixpkgs/6512b21eabb4d52e87ea2edcf31a288e67b2e4f8' (2022-08-14) • Updated input 'sops-nix': 'github:Mic92/sops-nix/34ee98b8c2ca153a23a63c1841a0a067313856d5' (2022-08-02) → 'github:Mic92/sops-nix/773365016f5202a199f5aff72cac75c64add4528' (2022-08-15) • Updated input 'sops-nix/nixpkgs-22_05': 'github:NixOS/nixpkgs/a26a6f4529878fbfe5f1f287dcdff4a287c58def' (2022-07-31) → 'github:NixOS/nixpkgs/70b6236f3cbc815f2cae8d597418c714cf83d1c8' (2022-08-13) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index f3dc4ba..44a8dcb 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1660301723, - "narHash": "sha256-Mt1W+1dBmqmn2dMpqmutG0yrAo+11Ddo9YIcDscoUvE=", + "lastModified": 1660646704, + "narHash": "sha256-jUa09GGeTNuIka6Aaq+fDMHjGO1r/iBghDLxDG/tQcE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8a7c1d3582856a2e34942cc4371718ef252784ac", + "rev": "b7f322524d077b01f63d413cea4059c5fffaa362", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1660291411, - "narHash": "sha256-9UfJMJeCl+T/DrOJMd1vLCoV8U3V7f9Qrv/QyH0Nn28=", + "lastModified": 1660407119, + "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "78f56d8ec2c67a1f80f2de649ca9aadc284f65b6", + "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs-22_05_2": { "locked": { - "lastModified": 1659228671, - "narHash": "sha256-fraIjyAthUgoeDUF14tFeszKFPqaGnlc2qxczHbAmec=", + "lastModified": 1660410996, + "narHash": "sha256-arkfX1YYFmwMyDTCguzoOI4epABC41FGQU4J1/G3/9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a26a6f4529878fbfe5f1f287dcdff4a287c58def", + "rev": "70b6236f3cbc815f2cae8d597418c714cf83d1c8", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1660162369, - "narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=", + "lastModified": 1660485612, + "narHash": "sha256-sSLW1KaB1adKTJn9+Ja3h3AaS7QCZyhUKiSUStcLg80=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2", + "rev": "6512b21eabb4d52e87ea2edcf31a288e67b2e4f8", "type": "github" }, "original": { @@ -323,11 +323,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1660215038, - "narHash": "sha256-tqMyd5QB4MZh59wMHXqpro4hkKjz9ubQxkxFSuCuBGE=", + "lastModified": 1660496378, + "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "45c9736ed69800a6ff2164fb4538c9e40dad25d6", + "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b", "type": "github" }, "original": { @@ -383,11 +383,11 @@ "nixpkgs-22_05": "nixpkgs-22_05_2" }, "locked": { - "lastModified": 1659441021, - "narHash": "sha256-J2C83bo1mHcdfzxk8S3rE8iqNZM2AlPUGqftdhbm5Zk=", + "lastModified": 1660540143, + "narHash": "sha256-oqeOdJH0ey/UyG1G31BV6Lk8qjI+VKboTpTJB317OhM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "34ee98b8c2ca153a23a63c1841a0a067313856d5", + "rev": "773365016f5202a199f5aff72cac75c64add4528", "type": "github" }, "original": {