diff --git a/hive.nix b/hive.nix index 8c4f333..9104a66 100644 --- a/hive.nix +++ b/hive.nix @@ -168,4 +168,20 @@ in ./profiles/indico.nix ]; }; + + martagon = { name, nodes, ... }: { + deployment.tags = [ "prometheus" ]; + deployment.targetHost = "martagon.federez.net"; + federez.monitoring.apiKey = "370a181d-6b00-4c3d-af27-ca65e6e4c1b0"; + networking.hostName = name; + + glucagon.networking = { + nibble = 236; + wan-mac = "BC:24:11:7A:F6:2F"; + }; + + imports = [ + ./profiles/vm.nix + ]; + }; } diff --git a/secrets/discourse-key-base.age b/secrets/discourse-key-base.age index 04928f7..e87f06f 100644 Binary files a/secrets/discourse-key-base.age and b/secrets/discourse-key-base.age differ diff --git a/secrets/discourse-mail-password.age b/secrets/discourse-mail-password.age index ff6cbb9..7e047ce 100644 --- a/secrets/discourse-mail-password.age +++ b/secrets/discourse-mail-password.age @@ -1,33 +1,32 @@ age-encryption.org/v1 --> ssh-ed25519 oDAQrw QeSmwUu/CvV+1LIgeeGEW6PFgOESwqTe1o7Ack1PWSs -Z4a8OsJAYdnJfG5IZq/ktMD9F3pfN3cjim8A2nZM5a4 +-> ssh-ed25519 oDAQrw dfK8MlQ2s+D8512Oo/LpN0cJoy2EDNXHjDIL+3ThdR0 +GxmucQwGL4vpxLX0tBAlMnGxTHVCqNDjCHS65E4KjAk -> ssh-rsa krWCLQ -GnsaM6qYR58TY9xfDvFOD9On6jHuU6M5ku5hQExsdGFXkp+pultLC4d31iO/9YAw -NC+DjYRfQRgiVl7Ik7l5EbsoJitBsyJqNm6KckLgMr+m36i2l7myrUCXvkj29WPY -s2uRmlo4Ai6pthu2nI7dJJ0Va/Z3WtXOb+q2QIapbB/Jb3mcvkVbKkJNnVWpZjri -pafvy1ZlbWtOIHUHfLCyBo3R2sDQUFR8LL5Ww93CzjbiyfBVe0lgBvJJJUoZ+7qj -ZPykqASPNsKW+IQXb90BZlpf9JRi9l8VawZ1OCasWZ8e7UBvxMp/mpcZ9mUWDE+g -uvcAaBjx0ZHsN1u+k3Sx1A --> ssh-ed25519 /vwQcQ jCxoSbDPpFe7eHJEX3rov05XWPkWDZvIRbiWhvJmsAI -+ivctO51LaGMF9PJHGhwLRNXXxq8VZSfnbjHIU6lE4M --> ssh-ed25519 0R97PA 0GSdrtGAYks1eSMQXispNZTaa+UIQbP0eAzRP/aoXS4 -MNmpUVS/D5AxNaKfvxlqd5WW2+0cHjDo7/74vCzPDMU +Am6LHfH+97UfqXg9cm3BFETMtuB1rPY+cIdFIx4XATrrGs9+jQCp4dZGsLJNaAUI +QApTk+c62fCrsvTl0Ep54QMYWUtll0uQCu8qxdhH+KIKw5BQp42nBP0tx9kKTigF +PwRp1492LHRElPB3RS4IcI2pHXe9cpbokrvny9RbA4LGHH4BKjyozo57GbKIadm2 +CNqx4ea4i5CXbEiPsCuwRuvIYFnNbdjFEdg7ykCI3XRlaMx542Eq9Aeptuc0WE5B +jHsR+dcR8DK9Oansi83pnMoY6gRs5pyyHHxn86dHFg3vJ5AoUm/SxL97rpYe/hgZ +rlQk5eDwAP3oaqSUD15xMA +-> ssh-ed25519 /vwQcQ yhzPfb7EwUY43gwaNUPLgdkys8qGX3Eb463VrPjl3R0 +8SjkVSgR7Fmz2+qbBqL0BpPC61Nv9DneIyWrnScSWqw +-> ssh-ed25519 0R97PA OwkTSIUf5Hg5pSA0XifMGPZeWp3mMOlhpzJeQGnl5V0 +6wmtMh8ZOL2QdPPlMsoh5Nke4uchX/KrZC8WOQJiZY0 -> ssh-rsa jL+Elw -LWL7LZ+16Bnk2o/5/2QJq9UHqdUBXndU/lx+UqGSemcEJqbuikWEq5Sv9jTgME2U -mQYMr10vGxyDo0mSB9pbYGB5fWlAi61UutQKJuuwHgETF56fVy7+fsRmtokIcG7C -dF2ooUsx5/Ul2V0o2v4KieOZhU4KvhPwHVUdP6SkWCtn5kxrmJkbOjOrRNOVZffz -yOuViZlLlFrtzqtuwBi6uHhoz5x0t+m/v1JM1/zHFI5I3JPEpHvRfVKp7K2dOT2T -nr7UotsoGD2+nqrSp4YVgNdwy6EgjbVKGKF2rDr1hcUyMV+L8vRmAxQhfAWJxPYh -jOgHWIWOCLQX/6MrBB4+gvyNvrZUw6nvDwbMiMlVn6MS6H395Sh42PtiCnx27pc4 -xIGB4Zaq+38SnkpjqLVwSUak7rC0FHHu6nTUIQPIktmz8C1BWpNpTL4mtuT30U45 -MVKB1taKk87XVpqzxOgQVHa3CZzjANm8cpip4yWkcEskhv+3OZjeZNgkUHHR1KGE -suZxJJTrhhabV1N69i5LqmXgr4BZcJEkkdoJ4bFUaPttwkm6aUDpdSJbRowyzDbX -DWzmG/P1IpTdRw/7lKR7WUDMjsUmdMwCWpwlNetHM9t9aS62GBT2JKtTWfAPwdWw -VeGpq5o2R2EBW7ioVO3P14Mk3duD/PB8H8xr+gEczbA --> ssh-ed25519 jIXfPA UhMaLIx8smNo4NoGkyh7ODvqOqhql4bI+vZsz8WKugE -d1PVZiDWykjx86YDlChW1BrLU/NHbHRfnnJ+m/eCIGQ --> ssh-ed25519 um7xWA rjgDG4Rpaq0R54at3sc8TSUM1ipBAUq5Zl/di7i7jFc -G8XdosKSH6xxMMWFD5DbtyDdgNvfegbw1zEmTMI/TfU ---- Unyyf+PuoDOyqfNttxSNFPJrbmkLATNL03J0DbR9AxU -~bɸ@;ٟ|+;C-a!3L>k -34lqMv]P-Y9 \ No newline at end of file +JdoWrMe0LXZXKV9EBbA/9NqECmfFZa300+FJp5n8hj2wsvjcptnjdPYW7EfqadG0 +4I+bm+M8hbpWPkjkogcYgOR2Jt2X3+duP437ZibB8BQcF/fx632QTH350GSsO+5O +/9l3HQdbgUTxqHT1TE3vmmgB8ek2dN/Umw8A5IaCcNQ/7HbevT6MtHR3mDITL/ol +d7wK2HZph4YrLg/rWRR3jsyXtDa71SF+mGJ4u7wZ9YqLUoU1WbktTkz9FkfkFzBK +AbUOZeAjKMWP+dfWb6xDz1uiD65al9FYNItpycmhXPJOi7pnvZG8ZMk0scL55CjA +ZTOXRvohT4/UkYkWmyRJHPKC90lYY7acVbQzaqadRHSKLSkAzXz981Kl7hRlny6K +sEX047Azkq51mq24VK7kgpKQZqfkr/R/LdR2ZzzR4368opA9tOTMGR2DpySJJUy9 +/x5pfolEiiB/0sRBw7LIsB4DBeeR7bZcCBLyVGYilUGG3vfVunJEox/uOAeud1e3 +qwVpNja/ct1S+wfFqznWgnJCCpKhmehi5/FKIuJNzR545FdyGCF6GqgcFVeDegJM +Q4zRfzRCtMAx5FpIYqSVzDHc2Nlq3aXxOqY8nNDjKMJhZovcpyFRKAsxh/7bUPKO +ITYCp46FYb3Jkd9tGQdmBX0cl3jVkTW9E5+nN5s2Re0 +-> ssh-ed25519 jIXfPA I3roads7gB6yxnCGdndfUxXUrFDwuiul2PhREi/aJXU +EP+xtfIfdzkHloZPImVpVIGDnOYCk5TplnU7+w/sZ3w +-> ssh-ed25519 um7xWA V5U/iApNmX3S0Qf0oVgxtlUwaJr1QWUUIdpT4HwlTCc +h05tugZXG+bm0keHGJSDtmDgCRfnDBhNJ5w8vOEcEhU +--- lJg/Hk/09rSNrWKwbCsFH1eHlfRfU/Qgb4UY8nGsoeA +3P^AQouT[RB!Jճ߽xJ`aB"w #Ϋ/S \ No newline at end of file diff --git a/secrets/indico-ldap-bind-password.age b/secrets/indico-ldap-bind-password.age index 6b3eb43..ccc4319 100644 --- a/secrets/indico-ldap-bind-password.age +++ b/secrets/indico-ldap-bind-password.age @@ -1,32 +1,32 @@ age-encryption.org/v1 --> ssh-ed25519 3o8GBg 3RIPptoFB5jobW7En4aSzmUUr/Y3FfXvGSQeAlyI020 -tg87/iDBJiRNWQMLUrstxVwTkbyZFUB0NOAkA4TwCTw +-> ssh-ed25519 3o8GBg 45JdfZ6W3VcoRMfWa89pOEQ/1QWT57bpFUZPGLkvDiA +Sldt0ouyypPMlbSn+Ik01fRNvrTwYA6wdfTQzp+eVVs -> ssh-rsa krWCLQ -CWka0r6W+dVGpbH5RuFTlvTdr5uOSDkjKXNxXNew1H/vrQCJYK9GKa13ChX9YvWG -Q38vXIfDeuWF6wM1yzreFyjorq9BNrjt4R5afKxO7PVed7UHUD/iq+8Y3CVazhGg -Xv1ax+dAHVPddDNZsmBJra72/1gpt49mTpLKhRN+ZOVxZkxWICcAwiJtjjKRBsZ7 -9UgeeB7TigwGEt32y9UExkVNPWWnmF4Wp8SQChYCL1v1MKHW4TcMOMrc4fpUA/Rw -OBghMwoQ7KJjrvH1qhmipf4tP6HfO3sgXcyIffAIYhgkxQ3/XM3D9me/V4zHb4M5 -LAAcAhlv/p2ThAPZ1mNMww --> ssh-ed25519 /vwQcQ 96FrpdklBTgjleFlmGswZjh3r/MxsPgBjNmugHx+lTA -qMPp41P5xOkl03jVPn+O7ja+HPXvnw+NFp2TbO6BOAo --> ssh-ed25519 0R97PA WhAUsKjDvBMVVpEUrCveopLtTwQMtgHuiwrtYuAe8k4 -7HmTg/4By8EvVF3wyMgBDfM3TnYjRjj4WXdmSGofgCg +Ucm6n20Xo5RIHdOqkHkqcMzBgMZEmMs0aLONIhAKxwVzEBnNzwhZ8H/b+zsbQ6pz +nyi6lw/hZ5pDtLTYA962xN6LvuBm+DKzKVDdmivM74VK4o94H5PO2pWe/pd0YYeU +mdS2UjU4AjNfCL8Hs87gnkB4DXt29jb+nJl4xqggQGjGXtrdzDRnLJTvKqcgepsE +nqMmCiHcdtR2ZGHmkFw/9od++CZDIqv7TiT4f0E/aQPaanT5KM5faL/AOWbPqT95 +wkrkFiyISnfQzGhCNRYA8QKLU29oDDj/HKWaQW4pIh90Xd1uM5aYmuf+HdNF9W3n +AX3TI/FzMZImJD0NfQi8PA +-> ssh-ed25519 /vwQcQ KIHFW59699MvY4M/w7EoS6Wl59fdQ2QBqmi8yex7/mg +I4otwxsilm6xiiC68OW/M8M67XE4ZqEWYNqxhH0XReM +-> ssh-ed25519 0R97PA xz2p0RNsZDkAgfSaydz0YGouNCri9NMBF78mICLvHTI +TQLKjmgIZwXKta6RAEdI29kOBgkptqtu4T/hIEiT4WM -> ssh-rsa jL+Elw -sejmg1jXIFbBRxf0FQBoMotIwyVlJXDFBFlLAsr8fLg53ivy/JYviyMLFOa3h6y0 -mLqAUbOD1kPGM00xJa3bTOIIydMVz+dFKf1a7haMCh2AYXLVp274R0yECPCSmDJr -qqlHAF4Q5W5SjAl0y/ZPxOUkLE83S81jJqwMS1Xnc2J5o1/JKkz+Ic52dtMiu8bB -5E7JdpHHfp8yb2LK8s1tuJUs6WFAi1wz3A013E4YZCeHXHFibZgs7GMbTrWeXmzl -kGZdh5Txc+RO8OGfsaN2BvmKyn8GFlQmsRsE2DFGPN3nwb5ARw4ZqrpaKTbpmcT7 -8bmC9eJ+D1xuqggszKSHOkdViEgeytQcus0syH7X6kBdWcl95g5thPnh6uvQalA7 -R0WThXn1fzxaQUq2PMQHdfa0mplzTh9gGOF8iHOscXbTMHajnS7qThorc1V/e7va -aNLj5Dd/XoH7j1gUqibKp3/sjxosTeluiWUwkcYeEzjwtgdJGm50q4rGCuIhrXvm -qAnuDyFB/0mOBXAbCV/pQQeJM1ZuaWbflirjLONEIWSfrkw47mAI+NiIm96xPwQ5 -DFqgvl9nNcbgpAFgpQp+0rcwaRWXFaIS41ibSDiqOtxE0yecjU9dJK1Fh2xsbz6c -z34e8fQaxG29D1gi1oYhmmn06VWyy7udWa6DIRrSo8Q --> ssh-ed25519 jIXfPA M0m9m/ISpLLejIBS7iaD8lTm/duaQRqmLD4mvuoO1Co -gt+WkP6g/SizP9m9+00CcBNjm+B+tZVMfwyCkc0LI+I --> ssh-ed25519 um7xWA XjEGty2Jbcm60Ixi+yLgz0Oe4cB6qbLc86TOdX24oyE -qdyD23fHw2WmUiHhTKWFDkjGpACtLtBWpVwAN6EaNhQ ---- JZMDWZaRMtG5BMI1Qwf+DycuK7zztMxhZOPjJBGGZF0 ->վg,㜿Rkvj8EUaYk24?6I+}=0VN_%r?9 \ No newline at end of file +lleRKJb9ExqiP7WoqoA/7+GwYsuJBRrNZlulFYx8xGymx/H4gXUUmgnksboj/swh +2W3fBksR8qmKfIkW5/U6io1emj2TYzDKrAN52AGQX/ntZmYFPsQ2+W+C9vQraZd8 +sg//8IScsL1PS9juV647r8kHAZrJOSbXoZllGBEupi4ZN3XJH2zROd9tPZkTxj/d +AcXgVYDdyxKy2WtqEr8CPHEfb1TGlipYYYtYP8MPE3rR8C6R59+GTgyEnE5x1AMw +584mBLHWNFfYhJGzpmEUT+t0j4Z88VWtW0VtRqkBDlBlvMG9M1LzgLZjdrkgFAVW +gl37dK5VtdBX/OFzS4x+qei0rtEP900rwXDbuFPAiRan1I55xvUaCFVGDffIdZE0 +Pd77HhLzCklPE+Ep3RP4Lk2B7uxiANd0FTEyMb2yV4MJiy5JA2qqFguygK1SY+cu +dES1ZeU5wwp+t80aD5aFw2d0GsBLu532ofnsQmLhE1xeXPdv5CXuyavU+3ceIsOO +TwAauohHPfdZ5lFfYL/9mIf1M0rThj/nzexeNxSty3ERQsLxKkFuJV94IeVeSEVH +qJ0GtiG54s8vkFlbUandf/elAdiB/b754dt8huMS7EgKvLXUwo5caHC1ULXuItpQ +Xr35ECznN5rzixgDhmBV05mxZ5hHdFfHfs3SG97aag0 +-> ssh-ed25519 jIXfPA wzI7RPVtZXYVnOUXsgFPrMR/CleBlw8hbyo7EUbLCjM +i9qhRTXwBEMlV85Yx1phdycD+UVa7/AwngH7nytfqbI +-> ssh-ed25519 um7xWA kEP33DXXX09OjBoOYHnq4idl4qtxv0iv4haO29Xo+n8 +4exdazEulS6hB9/uF9GGK1mqiRIf8J/oiFf3a/jKxd0 +--- T+Foc1vmSW/pOZpdP24x3JlU10CxBtb7BhKNJSgwN8M +t ulvY\WnJ`OVu}z_,@TeM0mNH5m|I \ No newline at end of file diff --git a/secrets/indico-mail-password.age b/secrets/indico-mail-password.age index 78d7f6a..8b8bde9 100644 Binary files a/secrets/indico-mail-password.age and b/secrets/indico-mail-password.age differ diff --git a/secrets/indico-secret-key.age b/secrets/indico-secret-key.age index 5981c73..9a2c930 100644 Binary files a/secrets/indico-secret-key.age and b/secrets/indico-secret-key.age differ diff --git a/secrets/ldap-bind-password.age b/secrets/ldap-bind-password.age index 34c303b..2180a1f 100644 Binary files a/secrets/ldap-bind-password.age and b/secrets/ldap-bind-password.age differ diff --git a/secrets/matrix-shared-secret.age b/secrets/matrix-shared-secret.age index 3c8acce..7fa58c7 100644 Binary files a/secrets/matrix-shared-secret.age and b/secrets/matrix-shared-secret.age differ diff --git a/secrets/mautrix-telegram.age b/secrets/mautrix-telegram.age index bc510f2..8909e38 100644 Binary files a/secrets/mautrix-telegram.age and b/secrets/mautrix-telegram.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a86b779..bc589fc 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,6 +7,7 @@ let aragon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUDEhYDtCLI4ypIXhimPjleiGUI3lOTv5LntzNEPM1p root@aragon"; pendragon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILrJwgqLnGuUpUFacXLphiu8vUthVD4mA4a3Uytl5eSD root@pendragon"; perdrigon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIChtLzQ2YhAzJWFhuq4rdenxMFCNGD00PTwmmyjE8PM0 root@perdrigon"; + martagon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINX93idUkaicbyQMOS6EurPdzHpxeza1z7vP6n3+W+mK root@martagon"; # Add yourself. raito = readKeyFile ../pubkeys/raito.keys; bensmrs = readKeyFile ../pubkeys/bensmrs.keys; @@ -21,7 +22,7 @@ let ldap-bind-admins = active-admins; discourse-admins = active-admins; indico-admins = active-admins; - servers = [ estragon wagon lagon klingon aragon pendragon perdrigon ]; + servers = [ estragon wagon lagon klingon aragon pendragon perdrigon martagon ]; in { "matrix-shared-secret.age".publicKeys = [ estragon ] ++ matrix-admins; diff --git a/secrets/vaultwarden-secrets.age b/secrets/vaultwarden-secrets.age index 588b81d..23811e6 100644 Binary files a/secrets/vaultwarden-secrets.age and b/secrets/vaultwarden-secrets.age differ