diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix index f145a7ee..c0950e0a 100644 --- a/machines/lasting-integrity/default.nix +++ b/machines/lasting-integrity/default.nix @@ -36,19 +36,12 @@ fast = true; location = "192.168.0.1"; } - { - path = "zdata/big-apps/mail"; - remotePath = "zdata/recv/lasting-integrity/big-apps/mail"; - fast = true; - location = "192.168.0.1"; - } ]; rootDataset = "zroot/local/root"; rootPool = "zroot"; }; }; services = { - mail.enable = true; matrix.enable = true; nginx.hosts = [ { @@ -85,10 +78,4 @@ ]; }; }; - programs.msmtp.enable = false; - services.znapzend.zetup."zdata/big-apps/mail".destinations."marabethia.vanpetegem.me" = { - plan = "1day=>1hour,1week=>1day,4week=>1week,1year=>4week,10year=>1year"; - host = "marabethia.vanpetegem.me"; - dataset = "zroot/safe/services/mail"; - }; } diff --git a/machines/marabethia/default.nix b/machines/marabethia/default.nix index c7d3db1f..7b5340bc 100644 --- a/machines/marabethia/default.nix +++ b/machines/marabethia/default.nix @@ -65,6 +65,7 @@ }; services = { git.enable = true; + mail.enable = true; nextcloud.enable = true; nginx.hosts = [ { @@ -93,5 +94,6 @@ ]; }; }; + programs.msmtp.enable = false; services.postgresql.dataDir = lib.mkForce "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"; } diff --git a/modules/nixos/services/mail/default.nix b/modules/nixos/services/mail/default.nix index fe4332d0..7575114d 100644 --- a/modules/nixos/services/mail/default.nix +++ b/modules/nixos/services/mail/default.nix @@ -15,7 +15,6 @@ in { path = "/var/lib/postfix"; type = "cache"; } { path = "/var/lib/redis-rspamd"; type = "cache"; } { path = "/var/lib/rspamd"; type = "cache"; } - { path = "/var/sieve"; type = "data"; } ]; mailserver = { enable = true; @@ -78,7 +77,7 @@ in aliases = [ "@estherdereys.be" ]; }; }; - indexDir = "${config.chvp.cachePrefix}/var/lib/dovecot/indices"; + indexDir = "/var/lib/dovecot/indices"; fullTextSearch = { enable = false; memoryLimit = 4000; @@ -127,12 +126,12 @@ in "spam@vuztc.ru" "mofos@theportalnetworks.com" # Someone registered my f-droid contact address on a porn site :( ]; - mailDirectory = "${config.chvp.dataPrefix}/var/vmail"; + mailDirectory = "/var/vmail"; useFsLayout = false; certificateScheme = "manual"; certificateFile = certFile; keyFile = keyFile; - dkimKeyDirectory = "${config.chvp.dataPrefix}/var/dkim"; + dkimKeyDirectory = "/var/dkim"; }; services.dovecot2.sieve = { diff --git a/secrets.nix b/secrets.nix index fd488461..60376c29 100644 --- a/secrets.nix +++ b/secrets.nix @@ -55,18 +55,18 @@ in "secrets/files/services/phone-push-url.age".publicKeys = hosts ++ users; - "secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/git_at_chvp.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/hallo_at_estherdereys.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/hallo_at_robbe.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/huis_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/info_at_eenstweedrie.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/noreply_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/peter_at_vanpetegem.me.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/postbot_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/robbe_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age".publicKeys = [ lasting-integrity ] ++ users; + "secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/git_at_chvp.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/hallo_at_estherdereys.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/hallo_at_robbe.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/huis_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/info_at_eenstweedrie.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/noreply_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/peter_at_vanpetegem.me.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/postbot_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/robbe_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users; + "secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age".publicKeys = [ marabethia ] ++ users; "secrets/passwords/services/ssmtp-pass.age".publicKeys = nixosHosts ++ users; "secrets/passwords/services/acme.age".publicKeys = servers ++ users; @@ -74,10 +74,6 @@ in "secrets/passwords/services/git/mail-password.age".publicKeys = [ marabethia ] ++ users; "secrets/passwords/services/git/token-file.age".publicKeys = [ elendel ] ++ users; - "secrets/passwords/services/grafana/smtp.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/grafana/admin-password.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/grafana/secret-key.age".publicKeys = [ lasting-integrity ] ++ users; - "secrets/passwords/services/nextcloud-admin.age".publicKeys = [ marabethia ] ++ users; "secrets/passwords/services/data-basic-auth.age".publicKeys = [ urithiru ] ++ users; diff --git a/secrets/authorized_keys/charlotte.age b/secrets/authorized_keys/charlotte.age index 4db35656..6d44fedc 100644 Binary files a/secrets/authorized_keys/charlotte.age and b/secrets/authorized_keys/charlotte.age differ diff --git a/secrets/authorized_keys/root.age b/secrets/authorized_keys/root.age index 38c16f74..3e6bde8a 100644 Binary files a/secrets/authorized_keys/root.age and b/secrets/authorized_keys/root.age differ diff --git a/secrets/data-access/authorized_keys.age b/secrets/data-access/authorized_keys.age index 3d3d8d6f..ee346670 100644 Binary files a/secrets/data-access/authorized_keys.age and b/secrets/data-access/authorized_keys.age differ diff --git a/secrets/data-access/create_torrent.age b/secrets/data-access/create_torrent.age index 0173b19b..aea1929f 100644 Binary files a/secrets/data-access/create_torrent.age and b/secrets/data-access/create_torrent.age differ diff --git a/secrets/data-access/password_file.age b/secrets/data-access/password_file.age index b3e2f38a..bb8425b4 100644 Binary files a/secrets/data-access/password_file.age and b/secrets/data-access/password_file.age differ diff --git a/secrets/data-access/readonly_authorized_keys.age b/secrets/data-access/readonly_authorized_keys.age index f3ef579c..52f0d584 100644 Binary files a/secrets/data-access/readonly_authorized_keys.age and b/secrets/data-access/readonly_authorized_keys.age differ diff --git a/secrets/data-access/readonly_password_file.age b/secrets/data-access/readonly_password_file.age index f86f5034..123211c1 100644 Binary files a/secrets/data-access/readonly_password_file.age and b/secrets/data-access/readonly_password_file.age differ diff --git a/secrets/data-access/ssh_host_ed25519_key.age b/secrets/data-access/ssh_host_ed25519_key.age index 09eb74a4..fbcfb5a6 100644 Binary files a/secrets/data-access/ssh_host_ed25519_key.age and b/secrets/data-access/ssh_host_ed25519_key.age differ diff --git a/secrets/data-access/ssh_host_ed25519_key.pub.age b/secrets/data-access/ssh_host_ed25519_key.pub.age index 70ae9dca..91f4df15 100644 Binary files a/secrets/data-access/ssh_host_ed25519_key.pub.age and b/secrets/data-access/ssh_host_ed25519_key.pub.age differ diff --git a/secrets/data-access/ssh_host_rsa_key.age b/secrets/data-access/ssh_host_rsa_key.age index e6ddb6d4..5fea08f8 100644 Binary files a/secrets/data-access/ssh_host_rsa_key.age and b/secrets/data-access/ssh_host_rsa_key.age differ diff --git a/secrets/data-access/ssh_host_rsa_key.pub.age b/secrets/data-access/ssh_host_rsa_key.pub.age index 656781ad..aab96ca7 100644 Binary files a/secrets/data-access/ssh_host_rsa_key.pub.age and b/secrets/data-access/ssh_host_rsa_key.pub.age differ diff --git a/secrets/files/programs/ssh/host_configuration.age b/secrets/files/programs/ssh/host_configuration.age index 2cd8757b..28e4774c 100644 Binary files a/secrets/files/programs/ssh/host_configuration.age and b/secrets/files/programs/ssh/host_configuration.age differ diff --git a/secrets/files/programs/transmission/config.json.age b/secrets/files/programs/transmission/config.json.age index 8572ffd6..430435b1 100644 Binary files a/secrets/files/programs/transmission/config.json.age and b/secrets/files/programs/transmission/config.json.age differ diff --git a/secrets/files/programs/vpn/global.age b/secrets/files/programs/vpn/global.age index 4ed5cb48..79b86cfa 100644 Binary files a/secrets/files/programs/vpn/global.age and b/secrets/files/programs/vpn/global.age differ diff --git a/secrets/files/programs/vpn/local.age b/secrets/files/programs/vpn/local.age index 2e41c2db..77ecfd5b 100644 Binary files a/secrets/files/programs/vpn/local.age and b/secrets/files/programs/vpn/local.age differ diff --git a/secrets/files/services/matrix-appservice-slack/config.yml.age b/secrets/files/services/matrix-appservice-slack/config.yml.age index 1a734ee0..0afcfea5 100644 Binary files a/secrets/files/services/matrix-appservice-slack/config.yml.age and b/secrets/files/services/matrix-appservice-slack/config.yml.age differ diff --git a/secrets/files/services/matrix-appservice-slack/registration.yml.age b/secrets/files/services/matrix-appservice-slack/registration.yml.age index 01cafff5..c984ecd3 100644 Binary files a/secrets/files/services/matrix-appservice-slack/registration.yml.age and b/secrets/files/services/matrix-appservice-slack/registration.yml.age differ diff --git a/secrets/files/services/matrix-hookshot/config.yml.age b/secrets/files/services/matrix-hookshot/config.yml.age index 4b5be2bf..149345ee 100644 Binary files a/secrets/files/services/matrix-hookshot/config.yml.age and b/secrets/files/services/matrix-hookshot/config.yml.age differ diff --git a/secrets/files/services/matrix-hookshot/passkey.pem.age b/secrets/files/services/matrix-hookshot/passkey.pem.age index 73d7eab6..dd5935d3 100644 Binary files a/secrets/files/services/matrix-hookshot/passkey.pem.age and b/secrets/files/services/matrix-hookshot/passkey.pem.age differ diff --git a/secrets/files/services/matrix-hookshot/registration.yml.age b/secrets/files/services/matrix-hookshot/registration.yml.age index 790e8c7b..b7ace8da 100644 Binary files a/secrets/files/services/matrix-hookshot/registration.yml.age and b/secrets/files/services/matrix-hookshot/registration.yml.age differ diff --git a/secrets/files/services/matrix-synapse/config.yml.age b/secrets/files/services/matrix-synapse/config.yml.age index 29b9eb5d..197ecd6b 100644 Binary files a/secrets/files/services/matrix-synapse/config.yml.age and b/secrets/files/services/matrix-synapse/config.yml.age differ diff --git a/secrets/files/services/mautrix-whatsapp/config.yml.age b/secrets/files/services/mautrix-whatsapp/config.yml.age index a26357ea..f0ceacf2 100644 Binary files a/secrets/files/services/mautrix-whatsapp/config.yml.age and b/secrets/files/services/mautrix-whatsapp/config.yml.age differ diff --git a/secrets/files/services/mautrix-whatsapp/registration.yml.age b/secrets/files/services/mautrix-whatsapp/registration.yml.age index 0d87cd10..1c469edd 100644 Binary files a/secrets/files/services/mautrix-whatsapp/registration.yml.age and b/secrets/files/services/mautrix-whatsapp/registration.yml.age differ diff --git a/secrets/files/services/phone-push-url.age b/secrets/files/services/phone-push-url.age index fa430e70..041206b7 100644 Binary files a/secrets/files/services/phone-push-url.age and b/secrets/files/services/phone-push-url.age differ diff --git a/secrets/files/wireguard/elendel.privkey.age b/secrets/files/wireguard/elendel.privkey.age index 8632b06d..a9ec7625 100644 Binary files a/secrets/files/wireguard/elendel.privkey.age and b/secrets/files/wireguard/elendel.privkey.age differ diff --git a/secrets/files/wireguard/kholinar.privkey.age b/secrets/files/wireguard/kholinar.privkey.age index 5b118986..530f7556 100644 Binary files a/secrets/files/wireguard/kholinar.privkey.age and b/secrets/files/wireguard/kholinar.privkey.age differ diff --git a/secrets/files/wireguard/lasting-integrity.privkey.age b/secrets/files/wireguard/lasting-integrity.privkey.age index 0dcb204e..c2a115dc 100644 Binary files a/secrets/files/wireguard/lasting-integrity.privkey.age and b/secrets/files/wireguard/lasting-integrity.privkey.age differ diff --git a/secrets/files/wireguard/marabethia.privkey.age b/secrets/files/wireguard/marabethia.privkey.age index c4cae92b..e85f4b21 100644 --- a/secrets/files/wireguard/marabethia.privkey.age +++ b/secrets/files/wireguard/marabethia.privkey.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 9+Fe5A oDCzVr39E9pEEFVtN6w9nG/CHD0FviDtpiiHfEZjTRg -70Jx/nw8oUEa/Rv26XioYKexI46PP6pUECIoabsVYJk --> ssh-ed25519 s9rb8g gQuJcpdUA4aFruQNbtJcYiQ3N7PkSfaC5FPpwzdu5HA -iQUFWXQdWi3YwSuO7q05zGCv9TLTUIJO9nfImeilSrs --> ssh-ed25519 +xxExQ 7BEOA53BkRdfDYYtljw0vhqTM0Fe7JynKp90BXzYIQQ -H3PuMheUGbMRIdySOtlq22v/n2ga/Sk35zi4tujieuc ---- KIgDAadignftw8CCoRYLE8p+53wO5yPAZSuN+KRMfdA -WQT~TрN}Âza]CGMKY0ȞzNjE<Ӕ8͞2]cܢc:Cz޿]p \ No newline at end of file +-> ssh-ed25519 9+Fe5A EsaEh8Rk3g8he0/Af4UeRXEJwfR8EaoPlnLavTFAElA +69rxJgueku4nxwJFpLq4T0sPFBE77TatUd0m30Sc/68 +-> ssh-ed25519 s9rb8g pSKXwiUB15NwudYxzHuU57GgSdQLlg5v3NkzGw3hSBA +QRyuuBidE/ZhfRp78AeFkVKaEITzNMM4dB+jH1orD+0 +-> ssh-ed25519 +xxExQ IcEDfBjLD/cV5IoWeAtyox8kDxtMsuGJKk+Jy2S0JVQ +K0upEhxLDJR5audxXIN+tcv7RoqckGoPAgoIMD6/PMM +--- sg/l9N6Y53ZdA7YCiKPtLRzCLvFtnyYVDtmY+DHwwSE +Uh%hĘdoL`8e Ya0҆bSWc7`/T6#pn' \ No newline at end of file diff --git a/secrets/files/wireguard/psk.age b/secrets/files/wireguard/psk.age index 6e0a63a9..14b18760 100644 --- a/secrets/files/wireguard/psk.age +++ b/secrets/files/wireguard/psk.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 Lbmdyg ETGStr2S3Um1TbKn2u3yuy8W5dxoiZyhdl4bagTSTwc -tdCO1OwA5iILeXDtjaW4lXqnlWGJGQjj7WQNaQLRSpw --> ssh-ed25519 aUd9Ng VFpg6WL/s1rkgzgtv1gA+8ARVrMPXyUxcKWSxPyqGWM -2yOs1VI4oK3b4p/GhNaOcGPoZ1rkgpl2v+SaY5riedU --> ssh-ed25519 hKAFvQ e4ww3v675dp9szL7cnR5GKWKmhPu5lYy5oCywW1Hbmw -iNrz1mlPGrFQvrWHCaUSoBc+5O2I5xks8Jl0ITg5/Jw --> ssh-ed25519 9+Fe5A QLjoEkPb8kDOzmC/P3HS8LZnupb0ZPBU43sZRDAZST8 -4vmp+t51X4lArJV54XLbDE425wGUuk7X1nUiUrq+7q4 --> ssh-ed25519 KOkamg TrYEGGw8Mf4FhgK6pp19VR5Wh2JYUfVnCdiJkLzxnS0 -CA5IzdLCoZ06DzU27dRWnM2cXCvqstAsaRYXnhVUF1E --> ssh-ed25519 9PfEBQ lxbCkcnNcb5ixislCL/11du++XMTBkfhPiz9TtS/7Vw -PEnU5VBOMSHUEEX8dbQDASp3gyyKq6Wq5PCES18gQDI --> ssh-ed25519 s9rb8g fVNZvMSeIeL/HrecVJxq2lXZ0Jnrpgua8itIhhhbV0c -4uhBWt5KBCMR5g7alhRgGcF78eTFtJxBksVam1GjmXw --> ssh-ed25519 +xxExQ RxZbJdswGq5l8zI32vnXxrI3KmUCSMIkp0TMk02BZCc -uQaFBa3LMkuLiVPxKUo3xCaEmnj0q14bQAe4O8ta31E ---- pAsH6pyQbciqkFxUU7oy1uin330MBmvb/F5m8/OMG9w -k`D^X^NS"`Hi&z>#U} y 9 jrWh{n2L `o \ No newline at end of file +-> ssh-ed25519 Lbmdyg y0PHW2qc80037gHeLoGv3xQsbDtq1hafeQ+XfXDq+DE +EhKOCBfpBv0nSNgrodggyjt5ieQLEoCn/NVFMpjn+F8 +-> ssh-ed25519 aUd9Ng fHC0sCNZC6G9hr7rbzt7fjw1oqWM57r3tSd6CCpuCHg +YwY75l/fj8oc+IFu070pxEIooKzxlmP9KEW7T+kBp/c +-> ssh-ed25519 hKAFvQ RsPPPnQ4EW6tltxKIjiTDAF1+stjMPmpAnCR0hesXjs +hNpRSv3fVkVEdLZ801ZCzBAahveGzkuEFXMCzKO+it4 +-> ssh-ed25519 9+Fe5A IRQqvxpOlLMJCkSXuk1PYCIiMsIDIsDtxx5indceXlA +sk7nvBrBFq49LsgVrqyFy79braWWAveQUkeCKt0oGws +-> ssh-ed25519 KOkamg 0UsyKfZWoiGVLQfSYs2zXFd8VyHzrC+l4afjGbmeJXE +8mZEZxrrzPEBYRfQz9DjWVm/qX8t6xIVYMDf4JSAGPU +-> ssh-ed25519 9PfEBQ rIuknd/x+nQCXlvAxhlyCrTv/2QCTmeu/k2aN+v0CXc +gekdCSzygefjKsiUPXyxywTMYW6kJUAyVwwSoNfMkOM +-> ssh-ed25519 s9rb8g oPTtr3NozbMCeVjV6bj4vHTWW6vJOtDsx5nWeXSyAjc +MXNgnjlWJIEa/OCVFpCPh96BVhQh1/o9BSLeVCk75EU +-> ssh-ed25519 +xxExQ TLwKJX/bAnYelpcFSNN8REgSB3I/fxEkad+95dVo2To +5v28cAufry5XlmhM0cxW+C+x6gtUrtzH3kciWe++Lf0 +--- dLgrrSuJoIS/q+Vuxn4QJDNLNxgFK9E/RWYtcbRz79k +mGY ~ʷjI +{ RUwB6Pg}! ETjP\3/|PXw \ No newline at end of file diff --git a/secrets/files/wireguard/thaylen-city.privkey.age b/secrets/files/wireguard/thaylen-city.privkey.age index 2cf5e17d..cf7b2f22 100644 --- a/secrets/files/wireguard/thaylen-city.privkey.age +++ b/secrets/files/wireguard/thaylen-city.privkey.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 KOkamg wyWjHEqgJZCC8X4DMULXX5zJytk1d0UqMEOKYA9wJis -pXwF/jfjNEctrcFm7p4hWA1GPINjbneLIhcZ2iAK1BY --> ssh-ed25519 s9rb8g /0uoT0iAW2b/3sRSgVCZly5w4jr/FN8qLebBmspAEUk -EGLNqenzcJIdzZCogZ7apynj+OzgP1oF/NVjbflk30c --> ssh-ed25519 +xxExQ LW+vPPlXKUYoT3nFjXu5HbxXWoeioeL+zqUtwLyG3H4 -T5JS/UdSnj+F5dLuvvO3wlcMz1s/SJjRhlFJwNuzOQk ---- zkVO4IFRhNEB7CigwZAaWxQnTC+yLSUtHQ3TN2LyoLQ -f -|R:DθZwGK5bd"f6FzY?Irrj"!9,_$qpl;Lw \ No newline at end of file +-> ssh-ed25519 KOkamg ycsVX6qL5n3DSICalyKgqr8V8DGcDYE4qrKhB5VRKVo +c3bLsLwp1UlLtjf2eTUJHqfGZHmohvYZnjU91MYkKlM +-> ssh-ed25519 s9rb8g FTQptebEEd2xR3hN6MFJVfy277Q+G78fHpvI9HR5GTU +YViBufWD2WB7txk7slYDc/WCgemP2Fxb2Yk/YXoLp9o +-> ssh-ed25519 +xxExQ aK7M3j7fdXUPPBHG6kzBd+LqMu/PlWxNbEjmKjj8a0w +Rf0Cjkskj0/sDfJ3ouQBRhmmj+7Hm9w3nNsoRg2pPZ8 +--- akTPwWRcWEIgPHmmirrz3vFhJ94Kp71c8WYFqen4Y3s +(Жy@Fb6ݝERFMyW&ħCj[7B4N9" f< 򏑹 ?3 \ No newline at end of file diff --git a/secrets/files/wireguard/urithiru.privkey.age b/secrets/files/wireguard/urithiru.privkey.age index bb4c2703..f5daa745 100644 --- a/secrets/files/wireguard/urithiru.privkey.age +++ b/secrets/files/wireguard/urithiru.privkey.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 9PfEBQ 5BUPzmn/CWc0K37uePJ5aIRF4SlTOFescqODt5xlJiU -swgmU3/FvB8DO3rh8dZmkSwqXY+7MMTNPAJQDezK1Jg --> ssh-ed25519 s9rb8g k+oBlyvq8a0TLT04u7Z8RLq02CXrZUvNaUGUk+0RWzU -5gHf9Egld33N71KLw/N8Pw6eQZAl4mFhcb8hqqfzDTo --> ssh-ed25519 +xxExQ eIyt0jnyNR1/1kNcv9bjL+2ZFde6SDvAJmYDd7HJHyQ -RmWBHGUkD0zw+E4Mji86R5rfM3NYPpAjI3//NVTPhVk ---- BI6d30LxDJgDtCIlMXs0GV1ILljmuZj30V85vTgX80A -h+}&_ )%1j9F#5!keWRzC].AIC%p&])3 \ No newline at end of file +-> ssh-ed25519 9PfEBQ 74N9hlQqd9oD8xWufftHEyDMeOiQJ/apEWEv2LRF5UI +hhv45dE+YaDzc/x6yeVIHXdhi+Rigx8MpRnTtho7FME +-> ssh-ed25519 s9rb8g mUG7y108r2E52qTq02eIX0De9SSVnKqlJqCbK/JT82g +2V6FDuJkevAzxlkxSAu92HReKkOVCM5p16aIZG5isUw +-> ssh-ed25519 +xxExQ sgR2+A06k10fj6yXMTZVpPxEzjVIxxigDmZkwxeNQ0g +GFG6j4tiiJoBTM4uFnubGqroGCFgXbrZ7poBM1rFHtk +--- GkFm2oU04FpOZioNR3moloV5pt6/IfUzGq4/aHW/upk +p+H6Mțק~YӋP rMOraSz5S?" }kzDnn5E-xU3nO \ No newline at end of file diff --git a/secrets/passwords/networks.age b/secrets/passwords/networks.age index 6239a641..614a6dff 100644 Binary files a/secrets/passwords/networks.age and b/secrets/passwords/networks.age differ diff --git a/secrets/passwords/services/accentor.age b/secrets/passwords/services/accentor.age index b1005366..79f46455 100644 Binary files a/secrets/passwords/services/accentor.age and b/secrets/passwords/services/accentor.age differ diff --git a/secrets/passwords/services/acme.age b/secrets/passwords/services/acme.age index 1a643524..c38c20a4 100644 Binary files a/secrets/passwords/services/acme.age and b/secrets/passwords/services/acme.age differ diff --git a/secrets/passwords/services/data-basic-auth.age b/secrets/passwords/services/data-basic-auth.age index a4b090c0..0d68d6a5 100644 Binary files a/secrets/passwords/services/data-basic-auth.age and b/secrets/passwords/services/data-basic-auth.age differ diff --git a/secrets/passwords/services/git/mail-password.age b/secrets/passwords/services/git/mail-password.age index 86fc143d..ebcd0da4 100644 Binary files a/secrets/passwords/services/git/mail-password.age and b/secrets/passwords/services/git/mail-password.age differ diff --git a/secrets/passwords/services/git/token-file.age b/secrets/passwords/services/git/token-file.age index a65c17eb..e3e03386 100644 --- a/secrets/passwords/services/git/token-file.age +++ b/secrets/passwords/services/git/token-file.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 Lbmdyg Kbh51OhLWGjT4OLtHurVk0vz11xsPpLPI4zl0jFqPh4 -AcMTRQUVn0GZ1JXkoUljKXCiV7Nvstdcm7Y4zcpeUXM --> ssh-ed25519 s9rb8g hbELwPWfeQ5bQRk+Cfk71nKKXklsXGH1nvYenCj+I28 -mOwvavMV712JXzRwKLT0YyIg7taEnEy5EQk2dpcvHQs --> ssh-ed25519 +xxExQ r1RJwMNxAna76oYSASFSvK1Iuqbi4QC00meyZaIQeE8 -WUFkwBn9dyvc3jOWUY4I1uNa0uyvH3UxhLO1Z+bAyfY ---- nuk1OWbKi7ODIes3U55b4LvkeRcupSVWdZA+auZ3iPU -P}߂~+k #0^vaB#/xF~ZNN1b6cbfQHmNM CDE~ \ No newline at end of file +-> ssh-ed25519 Lbmdyg cABXwN8uCvOQeIY2OfFpoL8EgaOoDdPkqt92m7mMSG4 +bEPTmKhs8okfFcyOSgB8XoH8ikt2vcgYzgsd7Matj54 +-> ssh-ed25519 s9rb8g zitGUHHflVnu1an2YmwP/QbqR/oeOpD0KfUNaWyHuFI +Cak/sV0D/GVzw6N+DWWDo+TMro7LW1wGiyQhgrvKZmg +-> ssh-ed25519 +xxExQ oYEAtj4hKxgfXomhl3u1EJ8Lwk+SqVq4NuXBJWqN31w +EPKBeERdfSAr05bo2PqVpST6XDMPJU6DtkfDjmXSD4I +--- E0glwxFRUN8bccBmFIw3ga5zgjBa0SBQy6PLVkEV33w + LLĚY$&_(|@+!{o܍WN3NijI2wta"1l \ No newline at end of file diff --git a/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age b/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age index c3f586df..4d22999d 100644 Binary files a/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age and b/secrets/passwords/services/mail/charlotte_at_vanpetegem.be.age differ diff --git a/secrets/passwords/services/mail/git_at_chvp.be.age b/secrets/passwords/services/mail/git_at_chvp.be.age index d2dfb9d5..965cb9dc 100644 Binary files a/secrets/passwords/services/mail/git_at_chvp.be.age and b/secrets/passwords/services/mail/git_at_chvp.be.age differ diff --git a/secrets/passwords/services/mail/hallo_at_estherdereys.be.age b/secrets/passwords/services/mail/hallo_at_estherdereys.be.age index aa0df860..fd754170 100644 Binary files a/secrets/passwords/services/mail/hallo_at_estherdereys.be.age and b/secrets/passwords/services/mail/hallo_at_estherdereys.be.age differ diff --git a/secrets/passwords/services/mail/hallo_at_robbe.be.age b/secrets/passwords/services/mail/hallo_at_robbe.be.age index e258ff0c..07e14e0e 100644 Binary files a/secrets/passwords/services/mail/hallo_at_robbe.be.age and b/secrets/passwords/services/mail/hallo_at_robbe.be.age differ diff --git a/secrets/passwords/services/mail/huis_at_vanpetegem.me.age b/secrets/passwords/services/mail/huis_at_vanpetegem.me.age index fd26d4d5..eb1d4bee 100644 Binary files a/secrets/passwords/services/mail/huis_at_vanpetegem.me.age and b/secrets/passwords/services/mail/huis_at_vanpetegem.me.age differ diff --git a/secrets/passwords/services/mail/info_at_eenstweedrie.be.age b/secrets/passwords/services/mail/info_at_eenstweedrie.be.age index c13073e3..e96d7b02 100644 --- a/secrets/passwords/services/mail/info_at_eenstweedrie.be.age +++ b/secrets/passwords/services/mail/info_at_eenstweedrie.be.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 hKAFvQ dBv9IzD/+9+uQLHV7grbTOwBII6SWPwweupKrKJM3kQ -G9d3hDUuhmP0164aE9IIycr2ThOI3NoBBuX6YwmLPaI --> ssh-ed25519 s9rb8g yBqpyIUlTMHzz+7f251eT17vfLQRg3mlLfZt37NU2C8 -oLj9MxGr3/6pwcVonDKeF9G7omwLhO9ZSgSdUJyP41E --> ssh-ed25519 +xxExQ 8eEcw5nIGcFg/NUYTRv6TFLUtLVDCkyxzYmfsXTFrFA -yBKTSrpDDcSTVAa/Yd1GsZtUwhMYFLpw7J6LyjQBazI ---- WQPV6rNpWuAl8NmKsmRJPFFTllPFg5pN3WuPJNeBdSY -pe,w CҖZJ8PW Yz$5s礤$%:[\lrꗝC:$A!*Sd!x ssh-ed25519 9+Fe5A gCgx5GIc1ZjhvwWzzPJnTRk3605fNWoE5UieqyR0MU4 +tv2WUuO6gx8vzAnOo+YnfZ7uvzPgqRtOkKPy9Tt3Rb4 +-> ssh-ed25519 s9rb8g BXfNxRkYSIWjMZt+xFvFgUxAQTxsWZYTwA5THqCMWx4 +4EI2G6FipAtBXv6wCPc3lSXyH2nDl5Z9CzR+gtiQY/w +-> ssh-ed25519 +xxExQ lzqxzFbaZ9KLcQBCE8hVWA/7icZokCW1AgZ3HCPNNF4 +J8H3t6TbQBzcr2XycuXXwF3charX8jQKbV/qVNX+aqI +--- +ihzz+e8xwKeP8VSLUZsan1uphEtnGhRHUJD4VTS6Lc +T<{)_ 5nZl Ju`HTk<2DvdDcܚcM3ESDo=5ڥ>H w:ա'Xs8e \ No newline at end of file diff --git a/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age b/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age index 2224bdd1..57263047 100644 Binary files a/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age and b/secrets/passwords/services/mail/noreply_at_vanpetegem.me.age differ diff --git a/secrets/passwords/services/mail/peter_at_vanpetegem.me.age b/secrets/passwords/services/mail/peter_at_vanpetegem.me.age index 27eab17d..6ec8bed9 100644 Binary files a/secrets/passwords/services/mail/peter_at_vanpetegem.me.age and b/secrets/passwords/services/mail/peter_at_vanpetegem.me.age differ diff --git a/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age b/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age index 5908eecd..796b9b90 100644 Binary files a/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age and b/secrets/passwords/services/mail/postbot_at_vanpetegem.be.age differ diff --git a/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age b/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age index 61386998..ddafd5bc 100644 Binary files a/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age and b/secrets/passwords/services/mail/robbe_at_robbevanpetegem.be.age differ diff --git a/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age b/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age index 8fe5b3e6..fe98dd3e 100644 Binary files a/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age and b/secrets/passwords/services/mail/robbe_at_vanpetegem.be.age differ diff --git a/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age b/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age index 2ab69174..313bf9ed 100644 Binary files a/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age and b/secrets/passwords/services/mail/webmaster_at_vanpetegem.be.age differ diff --git a/secrets/passwords/services/nextcloud-admin.age b/secrets/passwords/services/nextcloud-admin.age index 2e7d9d6a..e160bcc8 100644 --- a/secrets/passwords/services/nextcloud-admin.age +++ b/secrets/passwords/services/nextcloud-admin.age @@ -1,9 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 9+Fe5A ILh55bxXxHmxBAk2mWuyKZE5hDcqsieLA1dCX44uAjc -ELgpxtXLWAKLX370Rc1TR1dBBydqJWEanQSqnOBRIQU --> ssh-ed25519 s9rb8g MvtK5sA1//X78yBMwFyNxKjQtJcb8s1t/LU7YXUx0A8 -UYDQerNHTJ/zeiaYk0zpbuyg5n51mM+SveIO5/mS/Wg --> ssh-ed25519 +xxExQ NiZ5avMq7Pf3OMjoMzkQAwAfIaXIEJmkRMCwPy63YDw -ZlS8OeOwzqeIRP2+uKDzS310hSSbDj0TI5ojnu+SHxA ---- nQTE15m0XzI18AGBTLDZLi8LswcvqazxsWECDhD/1mY -Z(У= ;^|'؈ǚd`+`%IjdB9ӛ,Rf&SR~ \ No newline at end of file +-> ssh-ed25519 9+Fe5A qN+BpuvfwqUp4UdtVbcZmG4NhJC+pXfbztYISQiPdSc +kKyPMgHE354AwJCcCxjtzk/s/M9G7xdh0/9eHxa/pMo +-> ssh-ed25519 s9rb8g MP7pWfzJ+UnJe5Lx4bRnxK6EJHLgeH2/mWAh2xmQWx8 +yOKmwyPMewGhFiTv3dziD/KVZyaKhzchWBVZPOJBuSw +-> ssh-ed25519 +xxExQ XX2zkyMoQl1wRtl2F6IONz2qA3Dc7nB527/iw0aV8GQ +MaAGFaREFUQpLmP9pth5j6iBAYAiA4ljTjnP0M9O5LM +--- XY+5Qs9iHayv5OiaCXM+Sm9EQTU01DRIsIs42RQUNIM ++6Gدrn.zݑ6' U+>_z\=>mLwk \ No newline at end of file diff --git a/secrets/passwords/services/ssmtp-pass.age b/secrets/passwords/services/ssmtp-pass.age index acf092a5..b1dcd694 100644 --- a/secrets/passwords/services/ssmtp-pass.age +++ b/secrets/passwords/services/ssmtp-pass.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 Lbmdyg xeCupwlI6S1vOgLUBmVra8mmMWso3Dm1t8bqiQnSl3o -bmVA8lqi/Zvcjgoe7t1nQ1bIs3xGiyFh2WD/DRxjfyE --> ssh-ed25519 aUd9Ng WeLBQ2Nnl+1+7mLEA6yujIiGplC4O5TsQ/Dv8Wk3GEk -EyVKG8ljmG+CtpdlIgYLp4IFCFjy929cYexnLjv8j3s --> ssh-ed25519 hKAFvQ he6iNkqynFjT97tLBqVuReahpU3VfpSBlUuatTHBnVY -M5vx+jOC8iRbaE1IoJ2NBaqDun2kr0lCidiOEgT9nl4 --> ssh-ed25519 9+Fe5A FN1qaSCjYRJ0l/n5KFMnM68vQn0Rw040pJgwW0HkkxY -sD+Erg6hLCD579qFi3ybyc+1hb0cHJfICz3lIkhwF84 --> ssh-ed25519 9PfEBQ kk69r/Fixc5yBh7mZKbA5vtZsz9Ek6UAEp3rlZZqThM -wK2PDERnIEaz5aCrN2wKclCQIMBxjueyy6aX34N54Gk --> ssh-ed25519 s9rb8g kD68d4a2dQjR4GDUFK28wPpTIvlOcDoihAjgSV6chEg -x1Cpn56elmlo3SV4A9hZOmKO7L0P6jo/S9khxtmH90w --> ssh-ed25519 +xxExQ UROsPg5x7cpNmsF7cYpupU6BjGn18lNjpIPQ+lxKyVw -CAv2NJ4bREgnI3EyGpFSTDI9QM4kMNJ2dPChMuHT0ZY ---- 0vlsvCx4ahHKR2WGAM/y4Sv/Ox/2+8p5XFKizjCa2x4 -zZCɪ?+-'NV.Q-軌h( ssh-ed25519 Lbmdyg rWYAQ5jS+bt7dV+7etRub375/bw4Uw0cwMkzrluhfmM +bjm2qZXab5M2fvAwGb2PCZw+ObqyfPcg0gkppiWabdc +-> ssh-ed25519 aUd9Ng dYO0KMpJgJDaKMtL8WPur/g9nuX7uAZ27CG6chDaGmU +j0a0C9MbD6HPA3TMtv0eHcqmAOkzWUA4UzErR48nmuM +-> ssh-ed25519 hKAFvQ VVCFaWg5NqRAbpwPTUJ4q5548UxzdgnEcUk8so/w3yM +MBtDQBpC1tDZnI+AFBmTz8TlniWmUPqtkWKROWOy/2A +-> ssh-ed25519 9+Fe5A CjilvGakncNaAp3E4w7x1P1aknKhYemV58FcC3pabEA +3LsQ85r7CoAdxeM1gIvXPw/UynJuJ1ufWgcMcRrTUhU +-> ssh-ed25519 9PfEBQ uPAWLiqtohRlkkHSl/zaoyiJyJpdMFaf0Scu/N65Qjo +BzxJR1ph+s3mQKvWmzQLPTJi8O8Dig+XX0KKeKQpEh0 +-> ssh-ed25519 s9rb8g /sSO+BDGFA2iI9RTvznTScdAKII+hrw9gszKo+CEiB8 +xaiWenfRxyUwUErLBrLZ/xscc2BWXy9kPBW9rhbB8As +-> ssh-ed25519 +xxExQ woVJdSBBlir6ppu6yMieVlZGXQDLJ9M4LPKrTGcKZFw +uTm49ckSfcN7nvCBrzIM/0O5NjeFOwzKFMI6mAoyXUg +--- hvCa/CvDlYzJSv1DuPaHsPRl4JSvsrGdAw3DRypHces +H/2y_ǮN<3e)vjsO'HT*AK& \ No newline at end of file diff --git a/secrets/passwords/users/charlotte.age b/secrets/passwords/users/charlotte.age index 841af118..93af4241 100644 Binary files a/secrets/passwords/users/charlotte.age and b/secrets/passwords/users/charlotte.age differ diff --git a/secrets/passwords/users/root.age b/secrets/passwords/users/root.age index ad990295..bba16dc4 100644 --- a/secrets/passwords/users/root.age +++ b/secrets/passwords/users/root.age @@ -1,18 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 Lbmdyg d7MMLPLB6WoQ6fLqXNt1lF1JNcXlMQg1avyBW6o0jA0 -nYTqcIfsy+ZiXEvoIDu7FF8s3NYkfFaZY4YCnABN+xc --> ssh-ed25519 aUd9Ng gau61aj+lg6Y6B8G7Rzy1WmTtDmUu9Qkhm78/tXOw0k -JFJ5CzFmDa73WuWllEFe14siXlMU04zt144Cftdoaik --> ssh-ed25519 hKAFvQ A7lQjAgw8Ll5Eg5+3m/d7SMV0jenS5+nE/R9DK9YX0k -9FUIPnGNYGebiBEu8vZE+AKEO2WEy0Ipaz3kGylzcns --> ssh-ed25519 9+Fe5A try064YTWtECrkioigxtYXPn5oGMTU98l5YfjxlhVwM -aEQnro8S79wXhQ/klDqryAVo0cfZ/s05VCF3FAqtNh8 --> ssh-ed25519 9PfEBQ 76j24TjmIiUKCvgsFypA3bTDfzuFM0mTQPnQ2xQySQY -/B9/kZFNo2WCCNQTYzUHJEJ9NdTdRu+l+grIJw6cy6E --> ssh-ed25519 s9rb8g 5B69ltq0ZuKTNs4W6CDSIdS8qOOoWs1bLGjqcRKbv3Q -fMtZNPL8KCpW9mauUmNXpPzbkUkP05ozvRiEHvQyWLo --> ssh-ed25519 +xxExQ nu3EskCYEk5PhvZRi43mTBFEn7qhNaKxxPNiUWrRXl4 -JOqffFVyi6xJI0ziszGQgQ6TepJCeFx3VvIpGakREGA ---- QHtQUnvar6c9AYQJ6Xj38kypyNVR7oJqj23uVeJgs7E -, \u8hem.n4Gt|'պZmPL+rm09g O< -+;ޡ8E190h &OjoUL]Q* @Ltfnؗ/Ë \ No newline at end of file +-> ssh-ed25519 Lbmdyg zSbZ1JxLiNpy1NEyXZ5rEiBhwePYDX4v973uLfZP51M +uB+KQ76yFlSDpP+QLlZmr408FSPuVccPKisRClQdvRw +-> ssh-ed25519 aUd9Ng pWvp37LjgcVAjYZHTGkLMqQYd+e2g7k1385oE9/lYH4 +ZrccfOEQMBCI2+ayjW9P/cqPl1Gor7UJ3TFC7lQMg1Q +-> ssh-ed25519 hKAFvQ 2hFCp8gLvCX1zqFFzUJoIieLa7+2aVeRyCRFyegbRWo +BSUK/Azzf0wJAlPuOY4rQPsN0OGCTPtlsmYFu5qsaIY +-> ssh-ed25519 9+Fe5A OZAthYKVhizQFsthJAparozgSFb2Zb2/5MRzg2tTIGI +2/Fcr3iIu2UK2Xz9TZSwaOuPV7mVVcdHAkaR9dkFY9Y +-> ssh-ed25519 9PfEBQ jsDAjdyYYZHQPFJneADzeyQi4ZrrQStUZ7Bb2irmTAk +/KrE4wtRXm2muX0bSSV3BTG56u4OqpRhjxJhLDBuxWA +-> ssh-ed25519 s9rb8g HAGcPh0HjKtiewYqQwox3AIvHp/KDDKROAstbf8RtVk +x0Hw4QkkayukTZbos4AoDs6t1y4B7DHXevC4269B0eo +-> ssh-ed25519 +xxExQ TmRW0nlIbykeBBjPe+TBz64jY1/PVlS+wWvq/YhGfTk +5WdC7ehRLjEpDM6r6rmPpK77zewMHloSneTs7WwEYBw +--- RD5lWGw0AhWNIQRc7MI3bx91LRt2fTNiGom7BYB8Gos +?o1tuxTpx's*v0"LSŻvɥ](Y_{yuL +;/.ffYgL}>$ z8Ӭ~~/QL$+'r>sIG9wJ \ No newline at end of file