From 8ef6bd5b3716d3b1a793d645c58cb12953591ae9 Mon Sep 17 00:00:00 2001 From: pigeonmoelleux Date: Tue, 27 Feb 2024 16:25:18 +0100 Subject: [PATCH] add neo to secrets --- .sops.yaml | 6 ++- hosts/vm/neo/default.nix | 4 +- hosts/vm/neo/networking.nix | 4 +- secrets/common.yaml | 96 ++++++++++++++++++++----------------- 4 files changed, 61 insertions(+), 49 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index e4ff44e..ff1bd51 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,8 @@ keys: # Hosts keys are age keys derived from the host ssh key. - - &two age1zlpu6qum5xcl07hnsndp78tllqph5jz7q8fr5ntxr88202xq9u9s9r2y7x + - &neo age1ed9esfstrdhfl3650mv4j3mjyum70245f903ye6g0f5t2ept73nqyksh3g - &redite age1utlywxylme0z3jenv4uz8ftcwteg9877y3zf46fu7zwjjwa05g7q88w8t0 + - &two age1zlpu6qum5xcl07hnsndp78tllqph5jz7q8fr5ntxr88202xq9u9s9r2y7x # Nounous keys. - &_aeltheos 0xDF6D6CE9E95E26E8 - &_pigeonmoelleux 0xFA47BDA260489ADA @@ -14,5 +15,6 @@ creation_rules: - *_aeltheos - *_pigeonmoelleux age : - - *two + - *neo - *redite + - *two diff --git a/hosts/vm/neo/default.nix b/hosts/vm/neo/default.nix index c4566bf..b85a37c 100644 --- a/hosts/vm/neo/default.nix +++ b/hosts/vm/neo/default.nix @@ -8,7 +8,9 @@ ../../../modules ]; - boot.loader.grub.devices = [ "nodev" ]; + boot.loader.grub.devices = [ "/dev/sda" ]; + + networking.hostName = "neo"; system.stateVersion = "23.11"; } diff --git a/hosts/vm/neo/networking.nix b/hosts/vm/neo/networking.nix index 7f5dcee..c3d4dee 100644 --- a/hosts/vm/neo/networking.nix +++ b/hosts/vm/neo/networking.nix @@ -26,11 +26,11 @@ ipv4 = { addresses = [{ address = "185.230.79.38"; - prefixLength = 24; + prefixLength = 26; }]; routes = [{ address = "0.0.0.0"; - via = "185.230.79.254"; + via = "185.230.79.62"; prefixLength = 0; }]; }; diff --git a/secrets/common.yaml b/secrets/common.yaml index 2660e3f..31c9b1f 100644 --- a/secrets/common.yaml +++ b/secrets/common.yaml @@ -5,66 +5,74 @@ sops: azure_kv: [] hc_vault: [] age: - - recipient: age1zlpu6qum5xcl07hnsndp78tllqph5jz7q8fr5ntxr88202xq9u9s9r2y7x + - recipient: age1ed9esfstrdhfl3650mv4j3mjyum70245f903ye6g0f5t2ept73nqyksh3g enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxRkdPZ3Y3RTgvRjMzblpl - Vk9adURxL21HMjR5NU0yR2w1MkxwQjdvc0RvCnhhTUdYU1g0Q2RPMkR5TTRvTkRG - Wm5SWFBkZ2pSa1ZRY2hzNnBDcHF5ZXMKLS0tIHlRMk11anBUZnJnNlpta3JwMlNT - ZllzN3NxWkVMZmtkb0ZDbmpSSnJFSlEK1x8FkIN+p1o+06J2GC68mvcF2hlSQngg - J63k/PrgyHf5tO5bZZPLEUDPzjDbHE1y1RL29kLFm3nWfIb7AyyvgA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ZVZ6SjNVVTlpSWU4YnVo + dUJwTmFGcmorNWdteHZwdjBlVXpNa1h4aUNZCkdsSnp0bFBrM3BaUCtreUN4V3p0 + ZVZXMTZDMGdIV1hYTEk5TklPM1hvakEKLS0tIGZoYkJ0aWladUk1RGpvUmJ1Nk1a + MlBWQVNiWDc3M05jbVY4SmpCRFJPWGsKZzeE2OvYcaB1fep6DqB2oR9xDw+WuyAP + GEuBg/KDjEVGLF2GmlVThEEsEmcgOW/yVf2MpAafdkdlWDLhhExMnw== -----END AGE ENCRYPTED FILE----- - recipient: age1utlywxylme0z3jenv4uz8ftcwteg9877y3zf46fu7zwjjwa05g7q88w8t0 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqMTgzUEhWT0QxVjRsWCtV - UlE0UmlZRjc3aHFkaDRxTEEzYXh4YTRVaWdzClpkZUxlQ0dtSFFxbjUrUlNxSmpi - Nyt0ZDJKTHJiU0kzcWFXdGMyNGhNZFkKLS0tIHNoNktDVlIrSld0ZVNQVE9LQW1t - T3ZpM2RZc3BZYXJ6c1h4blZWS1RZaTQKUq+cAB5GEbnjL6iyEi3KdELAcS9OfvxO - p/NRI0T3l79DiNNCGFzR6Q3O23/URWkV0vBQRE1mszotoWtbZWRy0A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBcmRoZ1RKMHUwTTA4VWw2 + TlRjRXRXa3ozTWYzOGVXN0VrMWlwL0lDeUgwCkdQU3JueEZUbmlsSnJYSVVrdHlO + TDRaU3YwYjJITGJMUHo4eCtyVm5lMVUKLS0tIFhiUG13L1hPQkk5UUlEcWVZalFU + dWdoUzhJZ1h4VjV3dFpLcDBaMVJEVFEK+6SlZyzokQwOx3d8k/qqjwSoJJmn4ytN + 7YoGydAn8jvsfveRTvR4RgqmbiQut23Zd/ZJclaHM/H66T9LEIk8KQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1zlpu6qum5xcl07hnsndp78tllqph5jz7q8fr5ntxr88202xq9u9s9r2y7x + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSNGhWRFlFa0F3THNWYVN1 + R3JiUDBQNkpqbmxYbEs5RVVsTFZTcUFnVDBzCi9ITVo0SkcxUFNEdjRzK1hOMlVS + ZUVIeSt1R09uTEtoVmEwWFZMQ2Z3cTgKLS0tIGpqNDBVZFlJRnVSMmZTRTVsVSs1 + YllsQUlYU0NUMVVQY3FTY0N4MHdjbXMKEpEfvPhar+vzKN43YdeSifvqq2rvw8xj + xbjOZotE5I2f4SEni27PrlFgRbV29Uh7XRReq3HDPPMJ6E9jL92QGA== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-02-05T21:38:50Z" mac: ENC[AES256_GCM,data:ZUA6Ij81846B2xumn9YjrlRufj9KfoItf2MCViVbIlQO97or1rJAz+iWxmf/I0YNzhOKzuchyG0X6669fUkePk0qNKrk9HBQLX7BM+O51qgEijrqq2SXlo8hyNTC7zUFL202yT1ATL8uD7lgBZpqgxBOcYp9D7+dkvotzFTOAco=,iv:2o7OGekocDF3Lj8OCnLOwGBBs/k13R1/a0CH+GTFsyQ=,tag:FqPF0Vvbuc5/D5tRLA+r9Q==,type:str] pgp: - - created_at: "2024-02-18T15:33:06Z" - enc: |- + - created_at: "2024-02-27T15:24:41Z" + enc: | -----BEGIN PGP MESSAGE----- - hQIMAwEdD9k5IbiyAQ//ekzBbXQzYUTep3EM8HFeQbbEk88Qcq1zJOxbJktSBauG - EsYOeabjwAD/ilyDp4HmQlXnm6ehqhkVHx+gebMgi24EN+zpXWt2tD+9BHLLMcH4 - iBpDhajEvrHCmXccmmGP2pV0we+gnhGkiwksu3xejK9/h2s7AVfE3RYS11bRqMM7 - R42HK7nlZZOHAX2ljxBp/hplhc4LfcUzAacLEZlxMvCbgytuz+UXygTppJUwywVG - XFY2Rnb9Amq+nha3adZxv58Mw0qv9f6GGvssIdXJg2xBSV/m4zqf9JVeCNT0+TeX - rEiAwvwylY2ApH3gsXmRP3RekITHWIy0DalXQISiv7WUn6aLoF+7LjiogloLmTjz - rSVrsaJLvtdM7gV+vSdzbAwUeOi8yZOl5UlqmP9Hw9CAtwlWtRgZDESbZmnBvu0R - 6SUOfclAUyDH58PkT747UObCxSjCG5pIHkrbJIBDMZghal+DPXzj+f66KScySJPj - 2r0v6oI9/gV7J6DwQPUo/XZg1ZBalCosQY1qJvq87FpBH+9oj3zyoDGVPs/NTMuw - tkb5kjth8cjZXXPfWl6lH3A/D9+xxUo8FtqH6jxfsejaUC4O2/hhLZ3boRzMs+Mp - itaoRzhAo20J6jRC9oHLIC/4hYBsTe5akwo89pEc8suWAUAfZ4wW+ILmzwsulGLS - XgEYmzDdeoVzDhu8/lXw8cBOnortw53L69N4sYE7xzTTEluuppZnkktNthusjpxf - CFWh465YzGJnt2M3uuj9eE/kiE2bPUzMAPNMobECS0gXbzk6vCACrBzl8K7mY2Q= - =EZnk + hQIMAwEdD9k5IbiyAQ//V+wZlKWMrEWbDPr00i7md1AAENVEQp1NMxGgIjgqzkFD + /PryzW2KDvzmqVxP0jnLf40bgdaR/QH9RlkL3LglNFPyWqMha0AHM8poCmVkMkb9 + qT30OP3dLgavhYY9SZEm7jOWlyr8gKD4jKFQZqD7ZtAyNcvvGsFsEyugix/x1t3x + VK29LQdnI3IH9DUFk55WGjpO7Q1SYHFbCPjU9OR3Skxol03xqjk0/vhmvpQ0RuRs + /Sp/F8aBveUkGci/RjlgdPme0wcKfmJFAZIy3atdp/0c2WW40EaepKeTiRjphCQC + cAE1iKDPgv+1Fil8KbaiOfYFpaLSaBFcP6xMx8F9HrDDpGLQqBfbaY2K+wyWBQEa + JOm3KHw8YXDp65+oOFPTeHmSdlLzTHcEEUscHmkBs1qBtiWpkMBmSEgkMS+7NWpe + V8SQu5D46rTi/5qnzZUFN8HomStM4JRO6MqNuWnvyhDAqmR0NLIGhKgGRY+G2M+5 + x/lFQO5zmjS6oNMcTUFT3jp0tRBRsNoCWweW7LkibjNlVBzS4L2RHpU7TC0UpuMy + zh60EqerX2bUohW+4fuV7vXA0+HGC7RzxG3ANAzcnf7acqANxj6NWH/EGaZ8g5CI + S4UDh5iet2n+2GYZR24aHnoq3zFejXcuB8lCa4lycKRo6Tsu91fTjLuDqZ8hJo3S + XgF5s+dJ7mF6pN0kI+LBWSn17WsfdiaGVeZvS1cQrRk6VbKYF2b+9s9E81gwftY4 + CnsIZ9f+LYCgRrzJ+hiCekEKj+kxOPSXku1V8fyMSy5oqact8qXO5pUBkKan77U= + =T2OZ -----END PGP MESSAGE----- fp: "0xDF6D6CE9E95E26E8" - - created_at: "2024-02-18T15:33:06Z" - enc: |- + - created_at: "2024-02-27T15:24:41Z" + enc: | -----BEGIN PGP MESSAGE----- - hQIMA/HTIsSK0VBlAQ//QMbefmqAju54SgbtUGbPEUdz4yLfR/WMlrTwYhAN8sl6 - x7sgT2VXyzB+10oNfx5kP344j1vB7fzyDvE/kxTIwMUJquH/Y6JJdgmZ4pnkyxxl - W5DZrRBQ4hs5BB+xIft5ehOp6fZ4z9NiuntP9jE5y92QVBXYWoC1hAVZtxEa6VM7 - /38jxJBRcZHUpXMaSHp+uWB208Vp2Q86O9kxdb7FpWV44OEQE3zCC983KT+LjNsP - OYlqDem1wFm5sWFKvfHW06H8ohu0EoZoHx3UvtogD7qJAuIwsU2Rno4oxfsw7Zry - XIh2hwPvnahH1fXMFTJgcbKGWrvKXWMM+C/HFmuIDg8ZuC743weDM3nx8+8QJpbZ - w6Gz5TsipOaluuXnVnyLgVg1k+m96D3eWirGSsljDc5h6QIK+S2pXVm8KFlEeQjr - PWGCdVNeA3oh60XWTOX0o3oKExCquRdost+MgBVbKvrQ4IoFrD1QkqTxq/BPYqDh - yncuzkG3NNxK4VL/TzY+zd1ZLslXUD8lGGBFtoeXE48BePVIBcuvPTgU/Mxsuzhx - N8P4YxXZJS4GXXWaiSCFBf8gexYy3QYj5sbG4X2bKsY8Ut1MnnCiEqDLdCn2ID9+ - g0dMXHgqcjlfH4Cx/TkpbMSbIeWE4NQ+RiWFTtWovlnwpybqIjzaw8XyOdtnoUfU - aAEJAhBMY/ddy05kp7vWnsIapNnN/y9U8ErmYWowk+gvLd2uIBGIiPwYrEYqWpgn - XrYc/pPxXA2XCwx6Eh66DP5TFR4dS56C+VVHgMG8FzIuxg1kr20dXGD7cSuSIWX0 - jTU4cSOsZ1sA - =49qA + hQIMA/HTIsSK0VBlARAAq6v05jpG35J8oXqoEvhri/0BjhavnlcPWXoYIpgnOh0X + PTnvo1CXqSfkfFlEYjxmn04mGfMTf7XgoE9GRrjN2on/leZofHEiclCeKc+ZY2kL + L/OICAh444ofnqhnLyE9WrQ5vAXpEvF5iron4U9Z8i0LG1heZk8WbBlBrEtwa2yI + bm9S3wcIiOLzUIZw3vccVYbMMjlKf/eUfLk94HDnJ64iMmMfr8UqsnCFO0Ixi54I + wIuK6LuMVPK5EMAM2e+p2a/R0CX/mV3B2Io2zVSqcQ1bTADlXB49nvMQUtJDBeku + pjmLBL4YjBtL/vtMa9KMm4YdQYMZdgSLQRUbBSia4HLreBlzoVrr8yXzDkZ3KSoz + qWvIsliQkYzWd2hC4CYBsGmkz10TY1kjpEbEbGwY+388W5KguKjobXzfDhbqDpJw + X8mnhtXWnQS23CGQ36wkFDE08EyIVtixv4eDXdUpXcveL2F/SGHITRvdFEfjhbRs + 7d4IjdU7idQTdYn/2BEWo0OWxPr9WBky8ZYCONL1/oQnBVaAI8wPf/uHypF/Tog4 + RFl4Otj+2MFfbvgXyrbjMELJKn2/WUGtgUvg3a2JZLO2e8DGe4pu47IQtRT2QElK + gqm1DNaLyNo/GNqMrQoVFE16V2aM0DVlzFH/4tZdbxQ9vo24MELjmXzurCQPDlHS + XgHTec0bEYwlqgZR0O+NxJgZvcp4msqEiKKkN70iYQfuNCe5aV6+cCs/fm0fRo6R + GvHX9YFnmmIkaFbv1U9kwkG5wofQn+Mgcb1XXk3cqOCuqGUrNAe+xZU7lsMEVb4= + =y3T6 -----END PGP MESSAGE----- fp: "0xFA47BDA260489ADA" unencrypted_suffix: _unencrypted