diff --git a/machines/web01/plausible.nix b/machines/compute01/plausible.nix similarity index 76% rename from machines/web01/plausible.nix rename to machines/compute01/plausible.nix index 48188fc..98232c8 100644 --- a/machines/web01/plausible.nix +++ b/machines/compute01/plausible.nix @@ -14,7 +14,7 @@ in smtp = { user = "web-services@infra.dgnum.eu"; - passwordFile = config.age.secrets."_smtp-password-file".path; + passwordFile = config.age.secrets."plausible-smtp_password_file".path; hostPort = 465; hostAddr = "kurisu.lahfa.xyz"; enableSSL = true; @@ -27,11 +27,11 @@ in disableRegistration = false; - secretKeybaseFile = config.age.secrets."plausible_secret-key-base-file".path; + secretKeybaseFile = config.age.secrets."plausible-secret_key_base_file".path; }; adminUser = { - passwordFile = config.age.secrets."plausible_admin-user-password-file".path; + passwordFile = config.age.secrets."plausible-admin_user_password_file".path; email = "tom.hubrecht@dgnum.eu"; name = "thubrecht"; activate = true; diff --git a/machines/compute01/secrets/plausible-admin_user_password_file b/machines/compute01/secrets/plausible-admin_user_password_file new file mode 100644 index 0000000..b0924f3 Binary files /dev/null and b/machines/compute01/secrets/plausible-admin_user_password_file differ diff --git a/machines/compute01/secrets/plausible-secret_key_base_file b/machines/compute01/secrets/plausible-secret_key_base_file new file mode 100644 index 0000000..79da760 --- /dev/null +++ b/machines/compute01/secrets/plausible-secret_key_base_file @@ -0,0 +1,28 @@ +age-encryption.org/v1 +-> ssh-ed25519 jIXfPA T6TOJOuejaoxw3zdeLzGm0CrSkDCCIRenL7wMGnDtlU +dubdAXhc32S6BszHddOcMA6aStZLOvc+36s3nZsYFMU +-> ssh-ed25519 QlRB9Q akzRDbZzo0LwoS1cOwE/tYdz7M+6bhgI81d37d1GtBw +KsGqFhkjlcJNquMi2+1TfQDBy9qguwh5ED9KBg4Y2hU +-> ssh-ed25519 r+nK/Q bL6A9O6UnjjyY+iLvbQSvSTjXX38FLsNjaSngoQXHxY +YZ7Y11inKpzA2m6lro9XXX2qkW6FmkeFGZ3Ak6X+U2w +-> ssh-rsa krWCLQ +dZVUqAyqrP3KHZlpu70IBU8U3I9IP71RzjbiF1rp4rOdz4iQ9ik88ai+hXVuadcN +DMl/7pIkVky6EL8JxFXTQhLivJUpO3NcN3iAS+CLKC+0EFVc03sLyCjn8IExO85r +Lec37ICk9n4LUNEA91A2h4C8U9TbDxCt7MLrIKcQtfFcd+4U1o9g3n19xo9PK1Ho +mcqTbUVgW1nOLxsEeCp5zsCQ+/8tFLcnK08yUB0RlWK+PDFZkk8u8Q2SYZjnaeEp +cwOhUnm/1a15IbW2oGCrVaEd/ymnLDJc6S7vXGpFDWHmOzvJ4Av9KZlGFYaWCjbV +7bGIgWkiQ7iJvTxzu0ZEqw +-> ssh-ed25519 /vwQcQ /DR3Kox7XkbdYQH7SyIc9atjwwe7Ah7hH/63RlzDd0g +k/199lCIfxR7l4ETJMEr1Ch1Zx8v3M5zn0b8mg6ip2k +-> ssh-ed25519 0R97PA H1PS+SlW5FNOf15eO6MKJ/nnVJQkfFMub0IzTS4PhDo +77zwCD0tbrLu4J0vS0RxPK3YZucFV1VYkUVoMTHjf2o +-> ssh-ed25519 JGx7Ng 2WIYPKkWXplInR8v1q22ygs7uYNfIzETeiCt5+MKQQQ +9Gsyr30kaNhxn+fUCBicvoA+hHiWpUf0d0pxRZauhMY +-> ssh-ed25519 5SY7Kg QTnBfvkMcnXpGITtaHr+mRZGogI1kTUqO4byfyMZhGE +89A/PPHVPeBQvTxCeXH8ITVDMkcsYUMbwatyw8NQ04E +-> ssh-ed25519 p/Mg4Q n6hQLuUv3QOMADJF0zpcALYqVUVi5tZHmKGmVZA0IVQ +ZXa+3y33kyo4vQxcEa2XTMIwjH2HE+bAKZw993PgROk +-> ssh-ed25519 tDqJRg Hf1KIZjUTTaHo18P1vWxaSehyKTFElBOovrCN0uJFCc +H8qGw8vIqp4bNiyon2uvTkrrd8lIYnMWnIfzS+w4QRQ +--- QOKOfU20JY1Sj+K20UUxgtPZ7JxKuZ1GtK+OKBZ1Zhg +?}2iM}6Bw#b2ϴˊʞvu,'.WԔIP'ixỲ*KotXI#6b`1p͜q "lSf(`U6kT'M@h{WY<SN;U ݨ \ No newline at end of file diff --git a/machines/compute01/secrets/plausible-smtp_password_file b/machines/compute01/secrets/plausible-smtp_password_file new file mode 100644 index 0000000..8452e75 --- /dev/null +++ b/machines/compute01/secrets/plausible-smtp_password_file @@ -0,0 +1,28 @@ +age-encryption.org/v1 +-> ssh-ed25519 jIXfPA CQffZYaxexZ2f+HeNj+SHeSak0kzNPiq6ExW7tUyCBs +oJQhtMFD9KSnXSPGRb3zLwCB2/KEXo8cgxHN5ML83Qw +-> ssh-ed25519 QlRB9Q V1PnEYJvFCdBRzN4z3iDtIzHLxxCimejdkqRS4zMCG8 +bVc87bxPmhofmoscGFBgQ+ffRlo216RiRkkV1MNoQyY +-> ssh-ed25519 r+nK/Q YI+1MYnCvSq5/QfA2y01IQlJeMGF0AfNs91QlrVaVGs +HSB8Gai96mjRbM68G3iRmXNkI4kqyJAWTMxWc8UOPr8 +-> ssh-rsa krWCLQ +k2mssz4C9p8K+rJ6Jbbm+w7uLTqoUOiOKvlt2btEyw2Lup8PQNfyTNFSBvuBMmfj +re1zuAufH0HIw3B0xWYauBSD4pasc7EFTr/OLoM8BRFMEb11IM5ZKJrO+hnWy0Sk +eIs6cpkoBVi4GZmkRfbvaitk42i9JzjrKU0OeqLCWQbHmHkTb3acsGXCc6A6JSbF +AVb+Eaak6EIdX1dP4PWyCxU2PkcBtYBcLoGH74r1o0i3SzvmuzKvlBntx5IzsAvY ++QNGJLNZl0+NePafAkvVY8UOrlzxj+tCgfunAGXIXlZlVfNcjZX9Wv30sJOtwpbw +DdkJAqSrNkHianC5MEGgpA +-> ssh-ed25519 /vwQcQ yxGAMhwDcoDjw5MJudEE95PakhZvNpYfmfWiM6wbQBg +C1o3mNO2YFnBXamCcpAW0aQVGrNNcUpDtSn8+VLobmE +-> ssh-ed25519 0R97PA XRWbcwt3wXR3AYg0rhzc6OUuAA+blVTf3SHERYy3MkA +iCBd0E1NrV7tv3/0pD0FYWgUfGmB4M+VWfiixvVGv68 +-> ssh-ed25519 JGx7Ng R47xTx4IGC/qf/v6WOXvJTd20MbeTdZ/8ovAA6d0iyQ +uBxcQVztpW4QaAR5rKfEVgtmrPk6l51+tY3brNjsTV4 +-> ssh-ed25519 5SY7Kg LNtU+/1YlPX6T6gO2lb/wEei7hsy2oud8cTQXFQy0HY +xxPvBAIpFyCUqExjseerz6WlwWQEmw9fltzQBx51KI0 +-> ssh-ed25519 p/Mg4Q uWIz5shMnsLXsh160cCW8E6kh9v4LPunOonugjWdSEY +5aRrIB5gxIplVWDGeMQ6g09togku6LxWRxBP7FbRNU0 +-> ssh-ed25519 tDqJRg G8rNpeGY29czDVMvvt4LZ7nffZ/JAHDzxuIs7C/0SEM +HowgAvrQQcvUx93ZdK5q2bSsJDqaOxFf+x/lwTRss4I +--- ktcSPCC1TpguyYJ2ua7IuGcEw+Z9YuqjzcmH18abjo4 +  9<1AܙpWJSWpsV/#9{cHBe5^ \ No newline at end of file diff --git a/machines/compute01/secrets/secrets.nix b/machines/compute01/secrets/secrets.nix index 1efa278..9a880d8 100644 --- a/machines/compute01/secrets/secrets.nix +++ b/machines/compute01/secrets/secrets.nix @@ -19,6 +19,9 @@ lib.setDefault { inherit publicKeys; } [ "outline-oidc_client_secret_file" "outline-smtp_password_file" "outline-storage_secret_key_file" + "plausible-admin_user_password_file" + "plausible-secret_key_base_file" + "plausible-smtp_password_file" "satosa-env_file" "telegraf-environment_file" "vaultwarden-environment_file" diff --git a/machines/web01/secrets/_smtp-password-file b/machines/web01/secrets/_smtp-password-file deleted file mode 100644 index e62b30e..0000000 Binary files a/machines/web01/secrets/_smtp-password-file and /dev/null differ diff --git a/machines/web01/secrets/plausible_admin-user-password-file b/machines/web01/secrets/plausible_admin-user-password-file deleted file mode 100644 index c4bf73f..0000000 --- a/machines/web01/secrets/plausible_admin-user-password-file +++ /dev/null @@ -1,26 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 0IVRbA sgkK/BmZCLsHsULqHIX4RyOwqGI7CDzSxcwweREzbmQ -ABTLn1CeiTL6RYS8IYctrV0hTIH6qfkUccHqFPiZqtE --> ssh-ed25519 jIXfPA sUTzDXQ4L7C/NfnSE5ug44p3zw52zbGa+hNvbBe/Tmw -5K7Kj98uj4Zy2OxvZLsNWIVPOs6Px2mh1AB67RucAOI --> ssh-ed25519 QlRB9Q QcRF4Z0RwOmOy83oDILow0A2oH/nklyRAfPXQYLgpw0 -9M+G35fXfOhl6HddiOlKahG0fbqgU9t1D+9kkhYiTpM --> ssh-ed25519 r+nK/Q 6Az+Pbp/SQZScVmF3+S0p5+vLEyCDGTUz0tkmBR8BxI -B5kf2C5G05X4IorJ7dsQAV3F8OzG1bw3S7EHaPmV9/s --> ssh-rsa krWCLQ -cWMGBxOIkrRfDX4g4ZrwZR/tUvsGY9ydAiYPrIjVnXJ9DkXgJwOHm3GyOye/IWqp -OrqMkGfGSbeo667l5gSJUOMrfmhL6jBaaRKpyOG6WWgOzg9O1mkBNC0JXd4HAg5O -tQyQmU8LasjiwHdOEbxzy5M80nv12k4nQzilQaWDHT5KOetrxw1uDFxj9N8A5EWG -DxKGAQAyjsGd2mP7ZFJFmDbIW4Y0K1JEDDVzb1diOiBqthzFSt3XjtybKdHYth77 -Utad1am1wVdhlVrLSp7Xe+mOZE7JEKUwIc1nRmAU2QSa4fbrmzu1iG4IWToTkHRF -FTAbiNwnK9cVrX+Ax7m0jg --> ssh-ed25519 /vwQcQ WK1vCOUXq8fZJuepzItFv17bpz9/3c4H3SKcrqUoUCM -fYM04JX/Gh+KS8Ur1bjGvfsyI0Rbr0hIPRxzDAf0dWY --> ssh-ed25519 0R97PA uIgJCJIhX4xPE3TikLCJ+lWXRbDWN/WSsaeulgk7MlA -afnTFx2dHUoXi52BZox0W6vSsoItVLZJW/UwTCvdYu0 --> ssh-ed25519 JGx7Ng VyrRn+0leBsohVw2j15K8rI+E4fJhoE68gEwOkChQyA -kDunwpYebSYLOEdPn4fefAnYQo4b0FI1Cl5X/P4lQSw --> :nE-grease v*`K.YtW B-q DtS]7l!Q {m, \ No newline at end of file diff --git a/machines/web01/secrets/plausible_release-cookie-file b/machines/web01/secrets/plausible_release-cookie-file deleted file mode 100644 index 05674de..0000000 --- a/machines/web01/secrets/plausible_release-cookie-file +++ /dev/null @@ -1,27 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 0IVRbA VKs6jZsp3MLy0CMxnJ4B6sJvURl6OfvB4oTsjK3iMSA -5ZeO7ATVAMRBFH73yplZ/7S97OdQAzAG1M50uCAn+Rw --> ssh-ed25519 jIXfPA 668zGzsecGiuRm5cynFya5CN66/UeTiwJUuXqkqg4Q8 -7L5GVV5WFk0LEfKfDYNAFHBxvY+VTmACQVWOzFg/vCE --> ssh-ed25519 QlRB9Q XMM5KHYZ+qsQRg73I11FO06dUUSkKZlOTw9nEj3WfVo -TuRxTPbX5d2ZX1wV8itEtSFEp3VFSUiuLgV6jS4hfgQ --> ssh-ed25519 r+nK/Q K2U8Z5HVkxYIBt538PmxCRgQotzIVOCXcGDE7jAn11Y -eCUFYMvS5u56L6Fbfx0bLdzehiHcApI3eyOteSukF2Y --> ssh-rsa krWCLQ -zDPtR4l5NdOXA71VRQ9qkcBK720V/xJTHedGs/BJSqXKguJtbx/HT183hGdPO+El -kEd70MCPQJdAA1LZTIdha8vXOqxs0IFD90Xr8bwSXxeRQD19c6hjglx6TT/Ub0zH -0zJFgnbsLhKoGzFUn8pGWjDM5YA0SPCop3Xu5a76JbRPAzUgx7Xtcj2cch5961RT -gqYLYnLkGZpNMopipLVkJQRFjQGh6IW5oPwso3sQyDgaxzG9elsxzD0PODRtj0OZ -4B9R+hAB3kDMMROY+sUo7lXzsqUR8X2bfzK/kkFLdxS2WKwjI4E+5Q7c6PSqT3R+ -etD9fBn2amn3bahgH7FLQw --> ssh-ed25519 /vwQcQ wB9/In/rG+LxCNLJ/vkFGTuEHsGVxpxWMjeaLj5TwAE -/lPOCuXKnuCtRf8MrkME6vHfeaDFhFsUkHhXniHHVsQ --> ssh-ed25519 0R97PA 8Vu6rEFRbZLYewplgPaSVnEHnCQT8dgpHnOYDfjPzS4 -IP6qL7WHybry/JIH9dutLpDm5uAQNy59dN1MnlU+W7Q --> ssh-ed25519 JGx7Ng OjXoCUi9OKzNJiiXrX7F1gUV2/LNDkQg/YAz+A/ga2A -1FcEqj/ePqPTYvat2CjCm5fYk/kwyJ3DFGs2YKA6ICM --> 'K4:c-grease -08OAHODHSmkpPfAT4gNyLJEy6kx9AzurrJR2rfXdwLatxvAz8U3GlLtNrsPZVX5C -4wXuvVZhCUSxLOBZXF7xvx3xmvGxlWGrNfcj2Tk+7aynLWcxn+vzrXs ---- cqf0fULr095YsqOKvU8E/tAqweut/C8pJ5zvaqoWLgY - .$u+UI.}qCPi_W [ޞ% N,"Ί_1:~pl5 aB[6Qt6S1c^Q'b)Jai&Mɍ芡uZM8-ܧhOTW?;Sxh'Fn9$= \ No newline at end of file diff --git a/machines/web01/secrets/plausible_secret-key-base-file b/machines/web01/secrets/plausible_secret-key-base-file deleted file mode 100644 index 4e2554b..0000000 --- a/machines/web01/secrets/plausible_secret-key-base-file +++ /dev/null @@ -1,27 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 0IVRbA l09WudZFthKCdLTe7afYDioT4CoqGHkluUTc3zDii00 -BReodLuVB6HiR37+AEXmON3RYbrhNmo5CeFHVUxlp5A --> ssh-ed25519 jIXfPA 5dUNE9L+jZEb2IO1I+EJIpSsW6VqztcTDhPz4jbbbAA -yB4cCkgnl0v9Hyc07IAJGrVytXcS8aK/1k/nFtaK52o --> ssh-ed25519 QlRB9Q fYLluN9WdwLXBSZ2cBdIJkEO2TRQfW7qT2eX2aCgIjk -w4OdL0Gr5AYZ6vDE5dKMS1heBFjUeOyEIZj9Hz6NKLE --> ssh-ed25519 r+nK/Q hKGV35+bySPJfn6oQqLs7W9oxjfhZfM+9QYa+z8NshI -b3hqzPf5c0SbSomMXW9qWKnUkT578QmuJFx5rRhvROQ --> ssh-rsa krWCLQ -DEV8w12cGk780AHluu4/bhtxRy8tu0lXtJjq0U9Ng+xA0bMjv9BPWLcg0l+g2lGW -vtk9XRLYzuKZ4CHkZY4HsZ8y4tLKJ6AZJQxhDca7FRs+rcVNIdu6B3fXj2Sn15TF -ubwVV7e/lfhw1uFsVoGdMkomi2ViXhi+R0avMRM/hXunBLoEHgWZIfT6Uqmg5mSz -tM2iid0jSgWg0GG1Rt6EL8tAOPK+PqYsP4C5QE1aYchoXT35Z3PLMZ3gIdglg2Go -tWLVWSom0A1wjZ1Ou/PHvNwM6rMMjEsRmefFnMHuK8DjQW1JWQffnqX4FJdghEHK -ND6ulH7LIjUCdMzrz8o0eA --> ssh-ed25519 /vwQcQ 0kq+jxbn+fOsmifLzcsgV8S8pSkCgZXqG4P8oLeb5w0 -0PJn6wB7bV0gk33KmQdHlZwzg8saUovN0ZmouEvPT3Q --> ssh-ed25519 0R97PA U7aMSWLb6pGRaBTpmA98atYmG8tLf0XQ3+gVf8XW4yM -KRujM+xySlwhrJjgK2j7ukSlwmxpWayhddFkfSq/tI4 --> ssh-ed25519 JGx7Ng kb7Wt4bSx/QYVEthQBoQhgAUg48BqhmYtxINcXAm3ic -hwk/4jkIfVJsWaMHnyIRxJA49v/8KpsB3M7PKMvCuDk --> +Jo-grease -n1YM1TS6JXxADWpImIgyF1GzjJwKP0VxN/3w7ujhwISvj6ssk9+IRGQPYvVCVLuB - ---- v9mPeA9Es0XoVAvsjBB1r/a036mY4n36qJ9gDAfQF3w -='.Z0_WpS voA*,΁*N:bz~;JL|u~F4A 0be??c 6w YԦ^w⭆_/zA`Jm+*$\-T9$j]^q ؅cCXh \ No newline at end of file diff --git a/machines/web01/secrets/secrets.nix b/machines/web01/secrets/secrets.nix index 7bb1163..3edfbf4 100644 --- a/machines/web01/secrets/secrets.nix +++ b/machines/web01/secrets/secrets.nix @@ -9,9 +9,5 @@ lib.setDefault { inherit publicKeys; } [ "named-bind_dnskeys_conf" "netbox-environment_file" "ntfy_sh-environment_file" - "plausible_admin-user-password-file" - "plausible_secret-key-base-file" - "plausible_release-cookie-file" - "_smtp-password-file" "castopod-environment_file" ] diff --git a/meta/dns.nix b/meta/dns.nix index ac148e2..4eac341 100644 --- a/meta/dns.nix +++ b/meta/dns.nix @@ -43,6 +43,7 @@ let builtins.attrValues ( builtins.mapAttrs mkHosted { compute01.dual = [ + "analytics" # Plausible Analytics "arkheon" # Arkheon "cloud" # Nextcloud "code" # Collabora Online @@ -81,7 +82,6 @@ let web01.dual = [ "*.wp" # Wordpress - "analytics" # Plausible Analytics "calendrier" # Metis "netbox" # Netbox "podcasts" # Castopod