diff --git a/.sops.yaml b/.sops.yaml index f8350bd..748154f 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -4,7 +4,7 @@ keys: - &system_monitoring age1dpaezlv6va4a8pdqc9w8exuy54d8y2q20yu9zc98q326lusyfdpsf6ph93 - &system_sync age1ap6uwhhy4uvq72hwyts7gzl027mnypakvj6svphgw2fm8jk72v7qtccs76 - &system_cache age1tst50yvdtvlggtjcpa47pvywcdaxfv00v04wfwf552wg4wraaexqsaqlke - - &system_ymir age1ql80ts2xlkzru4ws6q2syg6etuwy36dnzgtsj7uy2p27k4nzwc9q3gc6wg + - &system_ymir age183wgf8xp46chqk049ekyg7vsan2p50zh4lqfllcllzwuekeywdzqn7pz0q creation_rules: - path_regex: secrets/common.(yaml|json|env|ini)$ diff --git a/nodes/ymir/networking.nix b/nodes/ymir/networking.nix index d73e022..1a07a93 100644 --- a/nodes/ymir/networking.nix +++ b/nodes/ymir/networking.nix @@ -3,8 +3,8 @@ , ... }: let - IPv4 = "65.108.0.33"; - IPv6 = "2a01:4f9:6a:4f6f::203"; + IPv4 = "128.140.9.158"; + IPv6 = "2a01:4f8:c2c:17c9::1"; in { networking = { @@ -23,9 +23,10 @@ in usePredictableInterfaceNames = lib.mkDefault false; domain = "xnee.net"; nameservers = [ - #HETZNER - "2a01:4ff:ff00::add:2" + "185.12.64.1" + "185.12.64.2" "2a01:4ff:ff00::add:1" + "2a01:4ff:ff00::add:2" ]; dhcpcd.enable = false; }; @@ -40,10 +41,10 @@ in ]; routes = [ { routeConfig.Gateway = "fe80::1"; } - { routeConfig = { Destination = "10.0.0.1"; }; } + { routeConfig = { Destination = "172.31.1.1"; }; } { routeConfig = { - Gateway = "10.0.0.1"; + Gateway = "172.31.1.1"; GatewayOnLink = true; }; } diff --git a/secrets/common.yaml b/secrets/common.yaml index 38332c9..74de5ef 100644 --- a/secrets/common.yaml +++ b/secrets/common.yaml @@ -14,56 +14,56 @@ sops: - recipient: age1d085lpynkxxf0mfus0rd3qq0r38clwz9d5ddrl79x982z00j6qsqq8f54g enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1TWZhSjI0Kyt2Z0NEeDhP - T1U4eGtHT29NUnhjZFMyNDJGVHlSRXZLdkJFCnBtajBvOEM5VHpZWE5xdWhTNHJN - WTRDTVRIT3BzYWVyeUFpMWcxd1c2ZnMKLS0tIGhBbGg2ay9SYjN5d0R5dEZ4MkxL - azdkbkhNZ2c0RUt0RUkxRUMxMXB2OE0KMiEQUWqNqQ241hKL44SQxu/ye3Zcsp/e - ww5EJeJjX3JKSRTJeHAzyeAOkUKhY0Au9UWslnO2Xzf9mgm+DLK05Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbUJHWGZ0VWVuZDgzTHdU + SmtYK01oTUNDQXBxenhzNVYvUC80Rk5yOTF3CnUxQTFkSytlZzc2RXQ0d3NaZzRB + QlBvV3NVMFZCZWxCTnNLd21ud3Q5NkUKLS0tIDEwejBUdExKRzlOcG9pNmJFU2Jt + ZGk5aWhFZXB3Unp5SnA3c0kxQ0tWQk0KWKalWyzT+V4c9/qqviWyR+C0xZxiGzgH + 3LqXw53ha4jcTZSJrqox2yn42HVI7+bsID831VQVKpq9b/c/cm2FXw== -----END AGE ENCRYPTED FILE----- - recipient: age1s7xs405mkw2gagclktekz27lxhh38se7adrkdfc0x2l28j9xsvdqcdrsyr enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkU1JCd3ZJdFdFUVpIRVdE - M1RDY3dPVFRzazk0RDlqNjRmVnBWYVpOTUVzClpRVzUvT0JYaStCaTdGZGRwS3Ni - VnhKWERyZ2tDSFJOT2psT2VldXA3MW8KLS0tIHpQTmxvMFdUWjJmOGROWFU1eWtT - QlNidUlVcXpUaFRnTGgrYytvZVc2OEUKv0LBkes7rhiDDQvXJcDKemGa7NjP+Yak - 2QGMwwgueh+JBcie8e5LLeLyPtCGV2PdYtrBwW/SAEqEe+NH7ulpdg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXQjRKRnZLNnhHNElMRjl2 + Tzlwb0tjeGpjUjJ6Z21VVU5jbUsxN3UrR1IwCmhFbHFsWlFrSGpIWGFjVnlrY210 + U1RETDBpZFJUQlNJczZKcUlrbDBxN0EKLS0tIFRiZnVHYVA1NHZ4cURJd3RLT3Q0 + Skovc0dhKzlLTmRocU94VS9EQ0puNEkKzzL6M8UyurM6SDYC8iks4WFySfFzFuxH + qGiqXnWkA74rM0YZHDgfwS8JXkbgK4iDuNco0JTUse75ezVj2gIw3Q== -----END AGE ENCRYPTED FILE----- - recipient: age1dpaezlv6va4a8pdqc9w8exuy54d8y2q20yu9zc98q326lusyfdpsf6ph93 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0cVlNczdNaG5MWVlRNFJW - bm9OSmFMZ2ozZldiWERCeDd1T2cxbTVhTUI4CjMzZUhUWWhMRlY2dVFNNFI1eE5t - QUMyeTdENlRtZXNJd0ZObVRqN3RVbVkKLS0tIFJOZXFQaTRBWWdReEFzTisyMjdB - SUpTMTJsNUxWZGc3RTdra2pvb0l2anMKt1LrLDHgWbcOPzBAzcTkCXqHAr2oX+eN - tEbLnexbzOAY6n5xWrZ5mHmC8WQIciiELfyN8LTHcHmclzAJL5OoLw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQRDJtYi9DM3l2NFNyUkxu + QnVoZ3pzblRvTGhUaVI1a08rVW9FWHpIcG5vClVIenpwdHdkRldPL0gxM1hkb29N + NGxkTWU5WTZwaUM2ckQzWlVBWXZ4QnMKLS0tIFNBbDdWNWprWElCaVpMdTM5KzJn + TzBEd2t3a3p0MXFJbUhLWm1xc3gwazgKwhQLfnB/hMFrIYtzLoD3o9pMPZ+SfqE+ + Ynfd4m0LmhiwHgObzGgzs6AUSlkLW611Rn+Bm82z5zdsILgWFuv0sQ== -----END AGE ENCRYPTED FILE----- - recipient: age1ap6uwhhy4uvq72hwyts7gzl027mnypakvj6svphgw2fm8jk72v7qtccs76 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1cUM5M0NmUCtMRDlONFFK - R0R4WnNtbjJNcFFYLzlvVWdqTERnSCtWWVdZCnJQQXZWY1JSbmVCeUFyMUNxZjZa - eFU5MWJNZDkwaExqazBMeVh3QlY5TFkKLS0tIFp5bzducFR6Si9ySTU1Qk03SFJU - MDVrQjRtNWhiTkFoME5vM0lDRktvWjAKSNMTlIdhbvfioi6OdcFeisTTPiAbbclg - i2/60a0ne0ReLtZ0MxPdU8GXhJfW71GuxJHn+s0aycsen4xvN8FpNA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJNXdhYUx3Rk9nUE9vc3JW + OEV0d2RqZ3Z6WFlBUU1oY1ZmcTJFRC9MR1VZCmJRVUpDQURYUExtM09hUFdWYnRY + bDlWSEFNdVphYWk3M0NVOEd4bGhBdmsKLS0tIHYvRkxOMDRtV1lxbjU3bmcyQmRx + U0cyTWtUUEdPQTh4ZHU5bjIzSjRQZG8KU8NWbkzS3qbsEWoT4WVEwXc3c+0pQvk5 + R2tajntDpto8gf009+XJoSH5PBOWZWw66bEPYRcu9utcFsNvWwbyHg== -----END AGE ENCRYPTED FILE----- - recipient: age1tst50yvdtvlggtjcpa47pvywcdaxfv00v04wfwf552wg4wraaexqsaqlke enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhTXNKRkVRVEVHQm45WnIw - bjk2UVNGYzEwRHpyeDgwRldzNkd6cXo3S1ZnCjVqQXd1dGxYZDhNUE40MVNnSDAv - QXdtcmgvWVZTVVVzSjhwT2JUVVkxUlkKLS0tIGkyVnl6SnY1T29OR2ZLVUsreE5D - N2VFOXJVOEFVVy8vWGlzTm5xYlQzelEKa4/MCs17aoCOj1FIygjG9W1RnlTxCqYq - sqzduQNOWSDR71+YKywwYYgsbGygZhRGpTRG/KYm0YBjS3KNYxtXyg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyRVBWdVVHYldjTU9kdGYr + bHRPN2VQaFVpbkptcWxHbFJDNU1GcmUwdENFCnE0Q3RmTFduM0psRTlnYlRYcjVa + dy8zZnVUQTZ0bUhQSk0xYUJNNnRrZE0KLS0tIHlTV1hBRzlaRG9yU1AvTk84akow + TDFGOEUwL0xML29DOFZwRGhha1EvWDAKVUAQx+RFjsxAjnoE1QUTyJQr7ByQZpgr + kMjeVLM5YnTxW5bj9AfNUaBxTs6fHo0RpzD6a1lRUmkxPgVZWXkqiQ== -----END AGE ENCRYPTED FILE----- - - recipient: age1ql80ts2xlkzru4ws6q2syg6etuwy36dnzgtsj7uy2p27k4nzwc9q3gc6wg + - recipient: age183wgf8xp46chqk049ekyg7vsan2p50zh4lqfllcllzwuekeywdzqn7pz0q enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqSWxJMG1FSXFaWklBTktT - S2RhVnVZQ2VoRkg5dmxoSkRscnIwYjJoOUN3Cnl4OTgycmg1N1gxeHVTaXFZUFd6 - VDg4QTdmYjdaaUZrMVZqaUdKUEVrN00KLS0tIFNZS0FhWUs2RHlkZVBaaTUrZldE - Wld2T2JoNncyUGJQb2pJMXV6b1U2MWcKMyGEqk3hbBD5Bw402HnwOjeF7aL9sk0o - q3ESSd+7OSqQnITW7vu/WpN6cm3RRYGNDAV+TmSZf/ipMLyFkSsiAA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBamp6TEdKT3E0bWdJZi9s + UitvQm5QNGxmN0Zqd0NpOWZ0cGV4MFNWVlZJClh5Ym9nUmRnNTZOQmcyMWhQajlo + K0pHUDVya1lSMXVyeEFpLzR5RjMrczAKLS0tIHFUY1R6RDA4Q1B4b25tbHh2a203 + TnJVVGQyU0E2QUxmMWhQNnc1UE9Ua1kK3cHTqKXDry9M5B9gHFJicNZ3KBonpM8N + N9wFhJIqHTmLtrphHMUQD0Sd+4QgK9CSEt6uTUlFFBINjL45ahtx9w== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-05-04T14:35:12Z" mac: ENC[AES256_GCM,data:nEY/5npKF+fo6m/nRxqOd6GA490JGkeYn6gKzPSY4sSA6977CUutz8Y5lZsUpoyVXRmb7j/6YmfO9sYntOdm3efR3CQKBPNh8LRWK42oemQjPNUX3lYxyCMLEQijcNsKTUbZ7keCk3Z4gOt7JBVaLtOcF/B54FKq+q8c7yd0ers=,iv:Uu1W6J9QR+atOH/ifMPL0Nl653MVRA5G/mCsgslggbg=,tag:gm2dvFNmzt/XERpCjYfDIQ==,type:str]