diff --git a/nixos/boxes/colony/vms/shill/default.nix b/nixos/boxes/colony/vms/shill/default.nix index 5fcecc0..6b4e2cd 100644 --- a/nixos/boxes/colony/vms/shill/default.nix +++ b/nixos/boxes/colony/vms/shill/default.nix @@ -79,7 +79,7 @@ systemd.network = { links = { "10-vms" = { - matchConfig.MACAddress = "52:54:00:85:b3:b1"; + matchConfig.MACAddress = "52:54:00:27:3d:5c"; linkConfig.Name = "vms"; }; }; @@ -112,7 +112,7 @@ }; my = { - secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWi6iEcpKdWPiHPgQEeVVKfB3yWNXQbXbr8IXYL+6Cw"; + secrets.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6bc1pQCYalLXdB4X+7kFXtkTdFalbH5rchjuYj2ceU"; server.enable = true; firewall = { diff --git a/secrets/cloudflare-credentials.conf.age b/secrets/cloudflare-credentials.conf.age index b80adae..74f6909 100644 Binary files a/secrets/cloudflare-credentials.conf.age and b/secrets/cloudflare-credentials.conf.age differ diff --git a/secrets/dhparams.pem.age b/secrets/dhparams.pem.age index d503246..bca8048 100644 Binary files a/secrets/dhparams.pem.age and b/secrets/dhparams.pem.age differ diff --git a/secrets/estuary/netdata/powerdns.conf.age b/secrets/estuary/netdata/powerdns.conf.age index 16b3288..7ace098 100644 Binary files a/secrets/estuary/netdata/powerdns.conf.age and b/secrets/estuary/netdata/powerdns.conf.age differ diff --git a/secrets/estuary/netdata/powerdns_recursor.conf.age b/secrets/estuary/netdata/powerdns_recursor.conf.age index 07c84ac..6e54b83 100644 Binary files a/secrets/estuary/netdata/powerdns_recursor.conf.age and b/secrets/estuary/netdata/powerdns_recursor.conf.age differ diff --git a/secrets/estuary/pdns/auth.conf.age b/secrets/estuary/pdns/auth.conf.age index 692300e..b8a9294 100644 --- a/secrets/estuary/pdns/auth.conf.age +++ b/secrets/estuary/pdns/auth.conf.age @@ -1,10 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 n8CpUw L36ivajrz0JmCTvTvANtuYqzSbSL9BCw7qZ9jZV/6xA -k4t4IWXKe33I71A7zJD4YCP4GJr6QIokc7+9p36g1WY --> X25519 JpwKfbsKt6Esh0+GAXfAHF293Qhts8vGSoODUSPOAxE -z+0/8vcGBYoslXb5EzsImpAiagaO32MVYw70efYBQ5o --> Y2-grease *"('T -5j4ocAbDAHv+Mn7CorFoRqK87I4omu6W3eiGhFl0pF2XBJgnCS2i0+8qFd57T0oW -Cjee9LbI8sDFFRO9lQ ---- /6tyKKu52i/cK1yKf/z1emPDjkP8WbDJUB/mRThBLwI -\TB,u6n.!"7R8˛ Vpvb0q(,A#tor\M׳}',Y \ No newline at end of file +-> ssh-ed25519 n8CpUw fAg/7pxnqWhx4ia0NpxoZp41PXFDwNZisoadPqkWwW0 +a3yh3GSFrZIH0gxIdDKGhqdK5GV/Jw8e3k8dzCuBflA +-> X25519 C71qeEdBawNVucX5cDdwfU/3qRXO7X0CJmfb4wsjFlQ +UJUKezoEGMt/yrUJ+ATzMi9gfKCsiyKS6mlKZhOE1Bo +-> QgpA-grease `^0T- ;[p G 4 +qfaNiUNdNFDGEJMOLoE+uVqXeoh78UH0os9DG1aPghWo3MQJ+/KGW+a/q+UHu7d1 +9V1ank9kIBWRcvtUaQ +--- BKpfFbC56c+pGNtKcyMXErMEWhu0VQHbJgTRp0BaKhM +VPɭcI?ٿN(pdnfMW1 ɗ)߅8ՈN)gKq \ No newline at end of file diff --git a/secrets/estuary/pdns/recursor.conf.age b/secrets/estuary/pdns/recursor.conf.age index cc6ae0d..1b8af36 100644 --- a/secrets/estuary/pdns/recursor.conf.age +++ b/secrets/estuary/pdns/recursor.conf.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 n8CpUw QjNXGWOUJ1wyKSN6WBUcUg1Iheb6SvTJAjhESBUPuB8 -BcmPlu+eqCqZyO5hDHvR8I3jVvzocbD3imvZ7Fhl+So --> X25519 w5eqTb2dmE0H3yx03k9PzDYgvBMi35BMtNjGKULdPms -mZEPfazZEMBoh4IuMWHxJcu7W5Hz2+pPYraLVtUd0YA --> vP0AU-grease 7 "p/b 2: ]dK!%{]b -P5/KbvcwfGfG84Cn7CT07ct7lGLF/g5oNV88wGZ6UipK0g0G2Xdn0k3t/gHzZpHc -3yVJGso5/r6G9FgG ---- GIjjyxKeVCAYPMT4yyMo13OVnLzL+eEF77qTVVTRJbo ->aЁoQ{nXE{GSwh͖rz;􁿂oOQ\9֜fyI,h \ No newline at end of file +-> ssh-ed25519 n8CpUw W+QHTbMuGCIzX5wYTMmacaDUForQckDDA/GvfUhuxxk +P9ZXfNYVdy9ypkevlvhMHtRG7/ka/Qq0Lk/gn1GFzVU +-> X25519 TU7g0shh1jjS3vsmfYAhjfEjGCtiF1UufVnG0VTDJW0 +O4U/SRtHXw09+0AmQBNmq4X+oSiXGnM269o8fOIF19Y +-> jze-grease C,Vm1 +12L/JV+x+e41PsvoEtljoF1e +--- DNTspjhDmKO0vcOUGniMAKTZ//ysWETjz18VgBTJ9yc +=5[v0\ċc;?_=4R>T~ kjA48/wk~*!25|3zF%A \ No newline at end of file diff --git a/secrets/jackflix-wg-privkey.txt.age b/secrets/jackflix-wg-privkey.txt.age index c015b8e..d187808 100644 --- a/secrets/jackflix-wg-privkey.txt.age +++ b/secrets/jackflix-wg-privkey.txt.age @@ -1,11 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 vf+WVg qXtAg2GwqpwDkSEYBFJJj+SRoGSV9iyoHnHkfNSFu2A -TqVkf9qrC61dm015+9B81UM2duJkkn08pCsb+P4DnCM --> X25519 3QEcbcJq2fkjfVxvOthjQLdI9oQe4bqnqStT9XGJfG8 -v3dkB8GmZM0edYhyfSd+NPgjTH6nVYcdPs7o0xibkvg --> -(?m|[-grease S#{ aJ3x*'s -PEzYDSgCJRy2hjOBmlDCLVbqawYhwFIcWklyJd2y7mNS1KvJX7ouOSzxSYYYC78+ -MaurcPYbKe8zqZdgAF+/e9mKf3gUBekqYltVEQveeQ ---- 5p482W+FJKbbv6YQ0Jtuy5bw75RG5zJkhG9YRzHcJY4 -wI|flBϼJڊA9s -\i_R %xBw?'~T%rIb A@K \ No newline at end of file +-> ssh-ed25519 vf+WVg 49MlmUh4nCOHTalKhJ07Ta+BpM4jnINkSLL/imNCJEs +g1vq+VEqTnu3cnA3c6osXyrcE0rJjaCYtyIdmHgPK2U +-> X25519 jwUC9PB+fD/Wtvyi8ngEAamyScllZZqM+vS+yVQ7fS0 +A+ZplDCAxdQpWCjEg7OxEl22a79BiBPjJNW+bB8EprY +-> E21RFxX-grease s +l/K1CHcO1eTXcvUV61UGM7279M5xaU5jFwirI7Kc1Eb7b6LD7u8968fiQXKJy+bS +D7A2x2SPrNXFbjI5kdIGZ2gLLBE +--- sl8/38fMzipYZL6p6yJ8LUazLDl6dVrR3Cd5ZApgy6M +_)IYk=̒fz_"#.?IF:7)VKD&o]=W^ \ No newline at end of file diff --git a/secrets/nginx-sso.yaml.age b/secrets/nginx-sso.yaml.age index 63e967b..6a0a750 100644 Binary files a/secrets/nginx-sso.yaml.age and b/secrets/nginx-sso.yaml.age differ diff --git a/secrets/pdns-file-records.key.age b/secrets/pdns-file-records.key.age index 3f9b6e7..eac7964 100644 Binary files a/secrets/pdns-file-records.key.age and b/secrets/pdns-file-records.key.age differ diff --git a/secrets/synapse.yaml.age b/secrets/synapse.yaml.age index 741e3a3..914b8da 100644 Binary files a/secrets/synapse.yaml.age and b/secrets/synapse.yaml.age differ diff --git a/secrets/user-passwd.txt.age b/secrets/user-passwd.txt.age index e886d67..b129eb0 100644 --- a/secrets/user-passwd.txt.age +++ b/secrets/user-passwd.txt.age @@ -1,24 +1,24 @@ age-encryption.org/v1 --> ssh-ed25519 FAIX7A eliaROKgZJ5pHG9fafJBWkgNyXxEf+mLM4ZDcWxVMjk -xqakzMg39A4h/30x0I/kguAXJFAdWGXNIFF6XwN8YMI --> ssh-ed25519 j67FXQ vv7q5hrYCpfzEpuV6WqPOcfSJi0ch5iPZoZ/3A+SUCo -nn0gmKtxO2yygDZ06gjm/3BAmCk2J8JJaqRG3t9BJJA --> ssh-ed25519 wbGjmA mJLB7ynPlwIepLmbrM50PYqwnfw3YL/raqd779A7N3A -CwAY4PSGRnf7iwqFOO72BhFOO3pSWOD/iJ2Eiyaskwc --> ssh-ed25519 n8CpUw OHaSXGdBorYjO5CLVtOrBtiToY1hOuWegEHAw+b2e2U -oQp7feEmm1JndrKfOhdCCyPPAwnkiwdR023MurH4dhM --> ssh-ed25519 vf+WVg 7O5icW5o6qmTsYpIru7zsa1YGfNHLWMD0AbFTYw/nTY -BWMWEhQZuwfNGhyDecA6Ehod2LXXe0mej+f1Qf5i68M --> ssh-ed25519 H162lQ OYKOF0kAjSIhUNxF1QnurWtNx2LUef5Flc9Ts7MT9U0 -/CD5y/mk7tlwwqWISSRZM4zJ86KXpKw0pR3Yl5PwLb8 --> ssh-ed25519 b6YMqg nyXEuYq2mZR7CdPf9WgzjWbMA6LeGrnucZP8P/W6v1k -a1PRL1amj5EUnKy3ntts+mj35KY3SnzdhWKDv0Uw674 --> ssh-ed25519 Lqn0Yw VyPYS4Ji7eOZ/ZnvduesWpNZvSuZWhgTqZxxdhyKMjo -KOZQlpkU8AIPwZjlqqn58QrjfoLjayHaRl8aXObfqI0 --> X25519 0Qx/KFWFSNOdNgyiPa/0a730raEejHUtbppVMsJIyXY -gv1WtZRySVbBdQPbm/i62FsoC5vDkuXRHDPp3WttIBY --> r?z-?\-grease x9 ]QgMK 7wyy .W7 -CFhO2JPqygpgbbIeV7uQ7TGyUb7tjg ---- RR/yBQldrLPK68Ou1rSEoRyuyxaRQg0FTYVS7ZAkU3c -[0 L GOhī~>|G)+A*f"2jrx۱/-0jnW˱q).}zB -5ba;wf$Xnwה,nS3$M9.jkJ)*LER+j \ No newline at end of file +-> ssh-ed25519 FAIX7A vkiI9/QgORO7LDGKi249WCiW8OWhqaeg6Xy8o4js9n0 +Bl6ZEX3fVnLZX6uQma+l9QUc7QNCqRDqnvs5PNYS9FU +-> ssh-ed25519 j67FXQ 3fEElWG49lDvFDwFXL+pcMCD9BWK2ajegCcJ0jAsOkQ +MeTpw5hF7dVbvIH4iLWHvPucc4byyBbh3LXMOMstqEg +-> ssh-ed25519 wbGjmA 3qUPswOhvVIYQXhn1flsJt8bO4oROm59N8zYK4BXQn4 +rWGJOBGUMRTOBDgkygKzs6ywdxi66e1nCjmls/Gl+T8 +-> ssh-ed25519 n8CpUw pozn8o0C/1coiRXa176R0r0FQ1v9dBYJSVAtNjX5rxY +lwTQZk8hRoob45XkhSpoDCJcvjo05SLNo1PpcIK5Dr0 +-> ssh-ed25519 vf+WVg +YufvXCrr+3KuaOKMljGMaQqTdKAbpEx86jKqVlyw2M +DdyNNCBSOz18IOnNNxgmaU3liMJ3OX7UX/+C7lRiEt4 +-> ssh-ed25519 H162lQ kmKLyq8O44w8IzWxpNQ+VX9vPJwAsczXXtWE7vQLvh8 ++Dp4XfygWe8Cvcu+XQwmk8A8n3RwmAhezSv99Gr0UV0 +-> ssh-ed25519 BaQlRg 3UjO7uUS65k5Wb5MQrGm/70yJ7i5C9EtT2JTU7hczS4 +kRguPDPuu1W6lzORCoB147C2E97YF6FGpzcTMWo3kVI +-> ssh-ed25519 Lqn0Yw 90qjI1kW9iK7lHeewC5/tERplTf9rt4jMk2G6/BzT0w +j8CfdSFZsmlCW8++5g4iPHnVueoyu6CuNeKlTJrgJ6s +-> X25519 Rfx2Y+QoB7SkTZloXHN8KFVkenmC/bXozZ/gRBQaLj4 +Q8764bgnUBJXDqwsi0fOchH2FNrrPBbH9ACX3d37nOI +-> m#gxE-grease :@I +Y6eP7n2s1pU1Q2JQRbgZfJnlXv8FXWMrIi7XBmV1VCyoifUog253LsVpI0PZeFUi +2CrDvTs +--- eg2ZSqguuzLIs2YuwuO+Tvex/yUd4qSDpA4RhfM4L/c +rv?չԸ7r{`LlYC; j?9 o?d\DXXeKGI94ځT^9eAU53 >BChAtHӤSI9\;%QtdCAe \ No newline at end of file diff --git a/secrets/vaultwarden.env.age b/secrets/vaultwarden.env.age index 85ea805..a81265c 100644 Binary files a/secrets/vaultwarden.env.age and b/secrets/vaultwarden.env.age differ