diff --git a/flake.nix b/flake.nix index 8785258..bdea5c7 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,11 @@ specialArgs = inputs; modules = [ ./hosts/vm/apprentix ] ++ baseModules; }; + + collabora = nixosSystem { + specialArgs = inputs; + modules = [ ./hosts/vm/collabora ] ++ baseModules; + }; jitsi = nixosSystem { specialArgs = inputs; diff --git a/hosts/vm/README.md b/hosts/vm/README.md index 84466b6..e8cb910 100644 --- a/hosts/vm/README.md +++ b/hosts/vm/README.md @@ -6,6 +6,10 @@ Voici la liste des machines virtuelles sur NixOS ainsi que leur utilisation (par Machine des apprenti⋅e⋅s sous NixOS. Toustes les apprenti⋅e⋅s ont le droit de sudo (les home-nounous ne sont donc pas montés). +## collabora + +Machine collabora (libreoffice en ligne), accessible à , mais surtout via nextcloud quand on modifie un .odt, etc. + ## jitsi Serveur jitsi (vidéoconférence), accessible à . diff --git a/hosts/vm/collabora/collabora.nix b/hosts/vm/collabora/collabora.nix new file mode 100644 index 0000000..c6b15ef --- /dev/null +++ b/hosts/vm/collabora/collabora.nix @@ -0,0 +1,46 @@ +{ config, ... }: + +{ + services.collabora-online = { + enable = true; + + settings = { + ssl = { + enable = false; + termination = true; + }; + + net = { + listen = "loopback"; + post_allow.host = ["::1" "172.0.0.1"]; + }; + + # ouvre seulement les fichiers depuis nextcloud + storage.wopi = { + "@allow" = true; + host = ["nextcloud.crans.org" "nextcloud.adm.crans.org"]; + }; + + server_name = "collabora.crans.org"; + }; + }; + + services.nginx = { + enable = true; + + virtualHosts = { + "collabora.crans.org" = { + locations."/" = { + proxyPass = "http://localhost:${toString config.services.collabora-online.port}"; + proxyWebsockets = true; # collabora a besoin des websockets + }; + }; + "collabora.adm.crans.org" = { + locations."/" = { + proxyPass = "http://localhost:${toString config.services.collabora-online.port}"; + proxyWebsockets = true; # collabora a besoin des websockets + }; + }; + }; + }; +} diff --git a/hosts/vm/collabora/default.nix b/hosts/vm/collabora/default.nix new file mode 100644 index 0000000..84442e4 --- /dev/null +++ b/hosts/vm/collabora/default.nix @@ -0,0 +1,24 @@ +{ ... }: + +{ + imports = [ + ./hardware-configuration.nix + ./collabora.nix + ]; + + networking.hostName = "collabora"; + boot.loader.grub.devices = [ "/dev/sda" ]; + + crans = { + enable = true; + + networking = { + id = "49"; + srvNat.enable = true; + }; + + resticClient.enable = false; + }; + + system.stateVersion = "25.09"; +} diff --git a/hosts/vm/collabora/hardware-configuration.nix b/hosts/vm/collabora/hardware-configuration.nix new file mode 100644 index 0000000..49d94ca --- /dev/null +++ b/hosts/vm/collabora/hardware-configuration.nix @@ -0,0 +1,32 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/ef139717-388f-41f3-b707-b0f75af3f546"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens18.useDHCP = lib.mkDefault true; + # networking.interfaces.ens19.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/vm/reverseproxy/reverseproxy.nix b/hosts/vm/reverseproxy/reverseproxy.nix index c3315cc..7e0c35f 100644 --- a/hosts/vm/reverseproxy/reverseproxy.nix +++ b/hosts/vm/reverseproxy/reverseproxy.nix @@ -136,6 +136,9 @@ in { reverseProxy = { enable = true; virtualHosts = { + "collabora" = { + target = "172.16.10.149"; + }; "eclat" = { anubisConfig = "${anubisMirror}"; httpOnly = true; diff --git a/secrets.nix b/secrets.nix index dbec4ca..51784f7 100644 --- a/secrets.nix +++ b/secrets.nix @@ -32,6 +32,7 @@ let hosts = { apprentix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCJV6jqQWEYuwi+OJ9r/4TbBN/cK9NvYWNiJhpFzcc7 root@apprentix"; cephiroth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOsBGkhiu6l3jeo15cQHMu3dPyL025zXPV2ZH02EDYEt root@nixos"; + collabora = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFa2D9fREtO2r2oIx6q9JAKFUHtxGbgEPMjkx09DQSU8 root@collabora"; jitsi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB6jVMIZ5y2oXX9HOkw7r5UUjw95MlFaFuu7FnEC0Q8z root@jitsi"; livre = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVfKNokHG6ig32hhQxTep+fKFmKahlDClPrX/dP4/gb root@livre"; neo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGfSvxqC2PJYRrxJaivVDujwlwCZ6AwH8hOSA9ktZ1V root@neo"; diff --git a/secrets/acme/env.age b/secrets/acme/env.age index 72ebb92..376a475 100644 Binary files a/secrets/acme/env.age and b/secrets/acme/env.age differ diff --git a/secrets/apprentix/root.age b/secrets/apprentix/root.age index 97706ae..f10f3d7 100644 Binary files a/secrets/apprentix/root.age and b/secrets/apprentix/root.age differ diff --git a/secrets/collabora/.gitkeep b/secrets/collabora/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/secrets/collabora/.gitkeep @@ -0,0 +1 @@ + diff --git a/secrets/common/root.age b/secrets/common/root.age index f7dff4d..94138e6 100644 --- a/secrets/common/root.age +++ b/secrets/common/root.age @@ -1,38 +1,39 @@ age-encryption.org/v1 --> ssh-ed25519 2k5NOg cR5ohdfnKc3NNlGxdVDsLe+jAmLBIfOiaGfFAPPmrTg -848H6k08p4PzbkD+c4AdtGAK0D3fxFFOEzrvqvFDgbg --> ssh-ed25519 iTd7eA AWwcHOwmn5hHn3POEFF5pJpvWJ8lcbrMe3n3JqBfyX8 -D2PdIh6BFBocjfNeDLY6f9Th0yixTBp7V6sMVEzoXjY --> ssh-ed25519 h5sWQA pWqJ5nuVHkg6rFvGn+8tkdH/cKQ/xwIMED/giZeCOGY -GOKAPL951GOkyQxM2SEst9Yv7Omhp+y22zW/Vbu0x0Q --> ssh-ed25519 /Gpyew kRpo5sKEN283fFQpr2ML9GuhpugiqRsQ0Ezc4BjBKlQ -8hKJmmgoNapIruh1hc+EUyB/uZVKvtZrocPPd68naMk --> ssh-ed25519 FtI9pg Ieby+KtL7TViX81m58F+y1Ll3aZubWndFBOpVEEr5jQ -JhpUwA+U5ppm+SCPzQ0JNA/hjGGUGd+6xpDenjPsnt8 --> ssh-ed25519 hTlmJA HTUuHAiK0jRB86m9kxk+K/U9b7cnTLwJ6DizUhpNOjw -T6VuoPzd196TizLAJgi4xa4pMXlF8nzrbQMENRbRlY0 --> ssh-ed25519 GCcVXA 9mjW03T5ockAAAtZtVjIZTIYOXwaCeG4nAK+K/97EDs -yYYVpyomBECUSw+huUaX7p9TdBclUukd0m1tZbrOP/0 --> ssh-ed25519 LAIH1A 6aYzD3onWE/lZE22Y+ZRcXqZX8ODq8gM84fvtIuG3ws -kuNjmtOxsCC6xpsMpDN+d5/nmKgKo5Q2n/NvVEJGqVk --> ssh-ed25519 qeMkwQ UkTD2aRW1DcE1pwwcUY5jdzFry47IOfrgcFeb/7U0iE -0K3bYslOGMvhvD52C/OYKWLCSD/GFYUnbAMNGOwJ4O4 --> ssh-ed25519 TqxOLw ucyZoaPMI+iC/lC8fdZlSwL70ScqA/18rFgZKGrWbw0 -fNLP3zECUQUOz33Rf2XZLHiY4uSt6oc0z5U7x0GBmtc --> piv-p256 ewCc3w AocWW7SEg3MVI/sCjCHu9obVVVVbFcfFazpmTTR+PRMj -498jlz/DJgqzZxmvF6sRHruaOK9ssXpuM1UfbZwzWE0 --> piv-p256 6CL/Pw Au/taJ3kM3uj06PdSgUPHC6UVCCOYDbMY2m2Eofbi63V -9NRjQxdkGM6lNnRvqWyR7ugweuvw4R6oCG2Qm8JBPuk --> ssh-ed25519 I2EdxQ nek4QEs28RjB5LmGI8QmI+PovaBsP20H58HLft9t314 -7kD4VKhSe8GVI6G5nEEB9S75nqiWcw2KIq5yXQW6pkM --> ssh-ed25519 J/iReg NaSxlV2jBjaEHjddB2x5wiUfu8dqzgPOKB1vaRo8cUY -b2Wak21uSh9FEcCsXAc9zjuakI0B7e2D4j1EmyKHCS4 --> ssh-ed25519 GNhSGw /0K7Q0S2PLsIa4gFjFpwcXYHhRuDdRJH16FMX2/tJhs -ti7iUykOROYtos8+jPlQoyCur3hhgZumzzaqHwE/k/g --> ssh-ed25519 eXMAtA wx6srIjvJ9E+lZzvg6jvtAVmTg/0B6x6f1zv8D6LuEE -iFjLVZ/c/pevSRzoBUee07TX2/tVFUThvvP6Bek4LIQ --> ssh-ed25519 5hXocQ an1+7W1qN6bEdGXBfio99DzkTcZC6gEOm2ZQe11x5Us -cbPU+Ih4aUVSOOveg/mQnV57Tn8boE4CKusOag5ZgNU ---- Ya9fvOnvystGbDpL8ti3cqD4sNIaMNF1Yv8OuviMgjI -Vj&qnZ6#;8BCGE1Wsb -4. 0cjA]I#M \ No newline at end of file +-> ssh-ed25519 2k5NOg rixa9J3x5WdikZ6JHibUNLkfUEego8cw13Rgc36mnRs +FlG6znZ0aLWhCRRwWUHx2U+ZToxFfHu1QSzYe/l9xwQ +-> ssh-ed25519 IJtQuw AiiXbhEE9A1pkMiW4h6l5RKHis4llQcJ8WLu06LKk1Q +D/1sfNrhz7Was7oxF9ZqsTDqDBkgJKJNVMfiwur51Pw +-> ssh-ed25519 iTd7eA Jfe3jwVemfIRsYnZ8TJXPH5XuRwIwRy3E248XuJNeTw +2X8C8FclOe/P0H7qzlLQFLeKROxMBzaxCoz1Hu5Hd6c +-> ssh-ed25519 h5sWQA 1Swe7b/WMDhSmkAyt+PbSLiknAhTo1E1mU5+uhaLmDc +6CDLzLfASC9w44QpdCyJtssx8x/VOuTByTeIKV11Z4s +-> ssh-ed25519 /Gpyew yZ3kTu7p1C/NnJ+BoxsF/xzOLI61MWqMVALHmjtNEQI +vmwHEhM/wHB6SmBvLBNPLgtX3RH4cZy6XRXRxXtsq1E +-> ssh-ed25519 FtI9pg Kn8jreESgKXYa8fEiFEZ2pLRUY/VNLEkXczjIguQrwE +KdhE5rcyg3Jc4rsi5LWp+gSBdv6zfMo0mwviCCddVlw +-> ssh-ed25519 hTlmJA /3lbvEtosyxvVEMAqmeSiK0DF5RInFnSlinOSFOgWxo +mAYTH1QV7w4S1TP2oatxUPGTQyvrRtsWYVlcnm5xE08 +-> ssh-ed25519 GCcVXA Dr07WpX0Qi05oEmlRzgQthdtbgrlaO+TdFS/CLvKDyM +CLylNARieN1GZkuV9sAdhhpmWZvDWL4lohjkRsiDbvo +-> ssh-ed25519 LAIH1A REb7bW3Y/vmXgOkW8aRg+PPld9wzeOZJtt+wScgtiis +bxgn6glfkRFZ9Wzed3vDMoos2DREGwcDWDBL57B7MVA +-> ssh-ed25519 qeMkwQ vct0Kj/eftIkrNF49TivKblzjC9yZ13E6tUmgsgOfEg +7vprQz4W5wia4yeeK36rwZXYOJH6Y7WBX3nMHBIHRqI +-> ssh-ed25519 TqxOLw pYvP8YzTWpQSul6z1knYscHcZujz1qBGe0NrZMEGWgQ +ThjtCv5Q3RUS0nx1tgmLCUGUm9vl+xGGMgtVJdBeMhI +-> piv-p256 ewCc3w Av0vCaFCAf4z2VCJvDC3lM+axi6Dt0feRqYlaM1WfhKb +bgBwt+eBETbag0brDkf7U9WtL3YUlUIG9P3LOZrb6o8 +-> piv-p256 6CL/Pw AoQCx9k25qfB3ZdLGBRxjp6iBblQvt0X8UyqD01JFtOH +XuCe++pFvaAzoA60RHh9MfPrH5QTLTFy1IC2ywXo2GQ +-> ssh-ed25519 I2EdxQ xdILzgBR+CE+qvOuX47s7jbrJy5rZcl+9ZK9zk+PVFg +K2JlwcH2pAlabAjVTdmwp+Z7q/CaPole2A40Eqvsmfk +-> ssh-ed25519 J/iReg ZpN/2brbFb/l8b9KVu7Bn0f4ZA/a4j0HztOhaPQENVc +NAq98et+NUBpt7oEMeYAFJdHmTVoBiO63ck48wMNxac +-> ssh-ed25519 GNhSGw Mj1k9wyJfeVDfNPqGMoTLzVHrmH42NE6wFe4hZgq6RE +pfek+KZadR7+no/gWXI2SxQiD8Nlkljsa7zVPJTwnZo +-> ssh-ed25519 eXMAtA X6duIpj4N9iYrOL9fEzIhQDNOa+Pb+1dw0mBWlfKLm0 +IOfpyQ2yiZ5OH/bj+6j0x0jrVI/kQnszPYn7k+fBm5U +-> ssh-ed25519 5hXocQ EV8/gTsmgG5u7VDPOXoFuY9c3CTs5a9H7xBoaJ2TUV0 +P6iwu1q+NxyEE/FS+hxo6Lr1+nXFYFFxgRK3RQn6nVE +--- QNRD5jh5P5LTJfukLP9zLSjXLPMUHZvP8w5J0Bhyvrk +O/f֜܈V>6}8w ٧G#O $:$[|GA_?,@N0zF \ No newline at end of file diff --git a/secrets/neo/appservice_irc_db_env.age b/secrets/neo/appservice_irc_db_env.age index e7635bd..634232d 100644 --- a/secrets/neo/appservice_irc_db_env.age +++ b/secrets/neo/appservice_irc_db_env.age @@ -1,20 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 /Gpyew CfIsypY8RtS9xiEz41Os6yTEJ0jLyq9abLnmD1BmIxo -kY6DRThZg1hsZsy5NtIwvronzqY+DntxMi/oJU2Lj1I --> piv-p256 ewCc3w Axo2RjgPlDAGnV1KDiFwrKyYeb0ScsjaQ0ayZqWEusHm -FSPAP9v5jXgaus25xR94woquDnz6CCPawXpzUxgLBEw --> piv-p256 6CL/Pw AxaFajLGlSPKOL3C13kdA5txo3XzaGyyJrEDeR5EGZFX -qNSby8foc3TUeMRkbLGEf/KhGMftfDdVs0yF/RJ0LBk --> ssh-ed25519 I2EdxQ pz+wkE+wVN4zQgM6zlOECWXzsGXNjhqEItmTGPKleBk -24kTeX0aj4LWrOlEyhKCd4vj3+d0Rr3xynC4yiS3E04 --> ssh-ed25519 J/iReg oYbqvVH3yyGrJHgruNtIDRlhqVyetK5o85RpxYR1NiQ -5k+78ZQsox92gUGw8JDHsK2dE09vMskLO5QDCAX4C2s --> ssh-ed25519 GNhSGw rVguQoCqPt7EcodF4+4QLkb3LZcfIRu7PqdhR2W/QgM -xTHsVt8uQldI+l+dWaOmLIkFAnkal6wlNwqsrG8JoHg --> ssh-ed25519 eXMAtA UcfI5tfsqs9wCacaTfH4U5E1kD7Mvk4kkruSbiwQngs -+mWFtbwsLW9fGGo4VKPc1JT2Cz66XBoVHNbunZyc2qQ --> ssh-ed25519 5hXocQ CrXLt0QWY5gKVYRpjoE2ipTkI99bOsz3e2RlHxdQlyY -aUrsUJgVtCCSyh49XXINzxTlCtFVD9vESoHSu2GK2oU ---- yw1hzyJgwgfb66dS4w4uuY9v4Dvtvjis/aURt3Uaa9c -0.z.`uF/sF7"RKDm 0ReB_?э+?eոG7Rv(d֎"F>>6IM0@ ^Ʀ -珴JBV`>{:jt[y6շt2I5 N8H֔N0ja@j?p}W \ No newline at end of file +-> ssh-ed25519 /Gpyew cxK0iiJC+ecMX4u3IrF6p/Cf4NboxlMa1pbDWEpn92E +p1orXxwVxgRLRLN1Stt4LpLjA8Rbt9uQLwWZNbO56nM +-> piv-p256 ewCc3w A+NxDMud0tfmUZC2JqU7nzncvQjWctJw5M3GAmQagHGD +cPmE/A+8e69mfBYI1m5gA0HBHXipZXP7yHM4/WVaLbU +-> piv-p256 6CL/Pw AtFDllfQT3kkJLZ8+eONpd8hSHlFaer3ma3mb3v3dKZS +MIkY8F7oyUB9tV4jRASHkFOLzSz13YM0PtybR92nS4I +-> ssh-ed25519 I2EdxQ TLIiVKI2i0p4VVb/8ud9Y1vh1ZR3mq5A0bbF/l2ZOWQ +Um5IKOVL52pXvPGODcFnU0yPeCzPRaj89JIiKO489Gk +-> ssh-ed25519 J/iReg ts38FU+7jCkZ3DTxjNoYOI2iwq4ZKQ20WilVe7erc3o +KXbBYhoXsUj9Frg9UdaahYX0Mk8Js1xGFbT04pKcGRk +-> ssh-ed25519 GNhSGw lciilsorSxfiAWxSz5XDKgpbyAjnlxpEqZRUT3W5WDA +FdeA5DlsbmZxxyJKsHN+mYQACkWbF/JNHmA95jWk6CU +-> ssh-ed25519 eXMAtA 78cofxPzWl7WDKEXxKv8qwEBBzaslA94pybM3+JVrlM ++s22rQiJAiPpnYVwDvLUxXf1IMVG/zEpY1G0AhW61Bs +-> ssh-ed25519 5hXocQ e2DIqVjDOjJRvvwdS+kMsiHxtNUeY7Wk8VCvcef+2GM +w3XGB3Th1UWKk8qJjK2H6Z8/s9iT7LfseRzn2Y8lffg +--- GvxwAzF1sb52spFwyQyrcCyaboTTUWrqOVwUem3+xos +.T!-'#urPz(+f֞^kqRvZ뽖]R&p;EWM Cw zM;T-^P"ߜzgyߑ M nѡ[xN'~7QІR/Jc \ No newline at end of file diff --git a/secrets/neo/coturn_auth_secret.age b/secrets/neo/coturn_auth_secret.age index b0493c1..9b72902 100644 Binary files a/secrets/neo/coturn_auth_secret.age and b/secrets/neo/coturn_auth_secret.age differ diff --git a/secrets/neo/database_extra_config.age b/secrets/neo/database_extra_config.age index 604be95..c0b5d5e 100644 Binary files a/secrets/neo/database_extra_config.age and b/secrets/neo/database_extra_config.age differ diff --git a/secrets/neo/ldap_synapse_password.age b/secrets/neo/ldap_synapse_password.age index 0aba78b..1b732c7 100644 Binary files a/secrets/neo/ldap_synapse_password.age and b/secrets/neo/ldap_synapse_password.age differ diff --git a/secrets/neo/note_oidc_extra_config.age b/secrets/neo/note_oidc_extra_config.age index 4e0abde..ce02b27 100644 Binary files a/secrets/neo/note_oidc_extra_config.age and b/secrets/neo/note_oidc_extra_config.age differ diff --git a/secrets/restic/apprentix/base-password.age b/secrets/restic/apprentix/base-password.age index 10ca63d..a63d7e0 100644 Binary files a/secrets/restic/apprentix/base-password.age and b/secrets/restic/apprentix/base-password.age differ diff --git a/secrets/restic/apprentix/base-repo.age b/secrets/restic/apprentix/base-repo.age index 84f0507..8867034 100644 Binary files a/secrets/restic/apprentix/base-repo.age and b/secrets/restic/apprentix/base-repo.age differ diff --git a/secrets/restic/client_env.age b/secrets/restic/client_env.age index 77d12cb..8dcd4e6 100644 Binary files a/secrets/restic/client_env.age and b/secrets/restic/client_env.age differ diff --git a/secrets/restic/jitsi/base-password.age b/secrets/restic/jitsi/base-password.age index ca05a01..c058dd3 100644 Binary files a/secrets/restic/jitsi/base-password.age and b/secrets/restic/jitsi/base-password.age differ diff --git a/secrets/restic/jitsi/base-repo.age b/secrets/restic/jitsi/base-repo.age index 61d0ece..7c5b433 100644 --- a/secrets/restic/jitsi/base-repo.age +++ b/secrets/restic/jitsi/base-repo.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 iTd7eA WseG1+SqvezgyoBLrgak/0tSvvbQQ+QIJqZyCPUggzo -Bh55tP5c3HTswx87AoYgObE1PAresp9lfJaWtIm03fI --> piv-p256 ewCc3w A6lCxXXrzlGIO0Qx1Fc9uQzO9b2+xZx91KFCBrC5fnxD -2ID5qSJX6sZTbKI57Ao5dVF9il8Xhs0PiVk8eSQ35Sg --> piv-p256 6CL/Pw AyKjnMCiVQ5XWJ+RQfu7lLxq4m8bwLdiRmofFCBjdnxY -iyuKo9p9pBuq+aYVxOwIFImTUJwpli09A6OiU+vQsH4 --> ssh-ed25519 I2EdxQ eU1NDqc9CEn8NpSsQHlw9UY3o/Et+T2q37THq3TeHRU -vmaNfgxmmJNTeFApFAjak2hGrQWWUKa+wajkBgS4z74 --> ssh-ed25519 J/iReg ipTx8RW/K9Ai2/qonG3G3sd+00A50CFYa1WjRY0EiGo -n/zGjEICesORNjRIqChXdGa9UnP47KsMwfU6tiRMaaM --> ssh-ed25519 GNhSGw Is8GR7vI/M3raf9eX4rnViRdWbnufy7e+1hofdx68Ds -nkCoEH+pNDFgi+lsns4sfS50o88AgcFobgzQoyLgaxU --> ssh-ed25519 eXMAtA jwhasU+1JyJHTZDwd7NyM5EE9kW0DJBdqtYx8pReN30 -S5CHvyxHXsbyQmehSjVa37Bz/xHPU/nQXiuCsbqmDao --> ssh-ed25519 5hXocQ DJhIB+JMelQjtXuh/fbN5UtzxXQm4T5aPWf29NNEd2A -wY4QrgVJSkMi59CRzAuAe1I5YuVWIh5XS0v0IWB4I8c ---- WtoelPBHgCE2zfHo91uvElSB9HhLOk6Oneza66wxPUo -4GڵՅ3KAZ6=Lg% u6>>oܕW]BW2s~ їuI(I2d7DiSmٹ*6,@G)iEi eA \ No newline at end of file +-> ssh-ed25519 iTd7eA NBL3Bsxu+pJp70FkH2uTtuxDucDieYeO0eibd9FsGxw +Pzq+8ERUjhzTkDA9hI6qqdAtyoqKqK6RSV5QR3WftM0 +-> piv-p256 ewCc3w Anv2d4fKXnL/cMIxz/ZW+LFJb2Ni+wey1IM3Ym3ZDcnP +nte0aBeGuFeE66A4Ey5LCj4Mq8Le76B8O+kNEl009EA +-> piv-p256 6CL/Pw AuwcgEu6JuG5TJTUfc8zo9g5hDUxfUNbBopIyxM53hEl +PfAzB80xr9NtlvOtpD5N4aUizs7YOGjz984LZ9ABRPk +-> ssh-ed25519 I2EdxQ oemhG8KOwvf2hT8hjFtq3S9aSIlZG0Rf0DXziEoPli4 +bPHXRVEPgO/YVmrXy9WxrZDEnt4VeFFTxJohNiqZJoo +-> ssh-ed25519 J/iReg 4rk93eGRUJEDM6VbgK/28/0ciPas+j6ns5owgL6kdDM +NEdvXX8Nt/1s7WrKOGTe6S6WAHsns4I0f84e3pX/pe0 +-> ssh-ed25519 GNhSGw +HbWTUZyOp6DKX7LqvDQ7j6rqBctdaDPd5zPEVnjSzw +ASo+0UFzk3v80tXS3RWpOpm62HSAa5Vvy6XV9Pvo2VY +-> ssh-ed25519 eXMAtA iU+9uulqgGuOuzAtb5o2/DQNbT+/Qf6ig0bBrMzPo2E +wYs60s8A7ornmrTjvkrbhGTpS6KpDS1C2duaZ+uFpFM +-> ssh-ed25519 5hXocQ oKTF7U5lc/nQywTE4IyxT8W8i9/9ZEv8oNDQt79WKlw +BBzL6UAehvIMHBCgF4GJB6+ayeZjCDZe4tZ3AbRiLWQ +--- AjpyTaW93Gub1u7zwqrw/8MbJBFBZmPsNMXlXa9jRu0 +ٵTHmXj:38?}$-4(K(42R Ty*K_7eqcNeeAt7&VbwQ@1dM#װtZ7CPik \ No newline at end of file diff --git a/secrets/restic/livre/base-password.age b/secrets/restic/livre/base-password.age index 8cbb875..eeb2e71 100644 Binary files a/secrets/restic/livre/base-password.age and b/secrets/restic/livre/base-password.age differ diff --git a/secrets/restic/livre/base-repo.age b/secrets/restic/livre/base-repo.age index 8a148fb..272bff7 100644 Binary files a/secrets/restic/livre/base-repo.age and b/secrets/restic/livre/base-repo.age differ diff --git a/secrets/restic/neo/base-password.age b/secrets/restic/neo/base-password.age index 6e8ece2..c438e6b 100644 Binary files a/secrets/restic/neo/base-password.age and b/secrets/restic/neo/base-password.age differ diff --git a/secrets/restic/neo/base-repo.age b/secrets/restic/neo/base-repo.age index 76f8d7a..f5ae9df 100644 --- a/secrets/restic/neo/base-repo.age +++ b/secrets/restic/neo/base-repo.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 /Gpyew mx+zUDoJlBkJG4GUEJpTmF+7cekgNMAqGf8L/hLKdAM -TBwEFgEWExFwuINvzdrfck6mnBCIpUAekZdTBlX2jyw --> piv-p256 ewCc3w AtCGtCqOkpF5bFUtuAiYe84lT+1G6MxDNkRU2pUqk18B -3/G5szghCSHCvmiCc7/y8hOZyanfbU71VI1P/CQ4g8Q --> piv-p256 6CL/Pw AmvS4ErSMMakjmPgkc6uuAW93uB7dkmLzwIWLnfELyXc -0LzlaXihUe55n4gSERN2IyQvjBZ1sbBO/sg3QuLSiaQ --> ssh-ed25519 I2EdxQ cwwjiEWrJhC3QlZxbCEGjVBPf3jlpjgroeDBzHh+NXQ -V9avgV8Fey4NRK1SYZNUThYncU7zfKU14U5EvQ2kasg --> ssh-ed25519 J/iReg BbZPEVsU+QcuK+R7O/iyM5QynQ01ve5mpYOmGS7T/Qs -VN2037c3niLVO/wCpl2aJag5yoH04Xs5sFRwNgf9Szk --> ssh-ed25519 GNhSGw LGM6jIDcmvJJjst+IZGZtIFqopu3VA5pJsX30LKh7BI -cHv8yBQWrrZGnfP+/iN5kboEQHR5fBCNWXkEED7f8vg --> ssh-ed25519 eXMAtA RXk5YHqqh9G8XIlFcm1yFHjEN7yRQwjT3+OIAu7JHj4 -xNZVF7sCfEIGU6fFrPutCks7b+ZYrXXmPrmsm68Iqjc --> ssh-ed25519 5hXocQ sCyqDVxD7B/hHT69Cwr+eI/kYI61Ea7fW974qrv9+hc -WyHRkS/KyupY1/REGTrOuVsCkAUgOZdZBDNU66fq3X4 ---- ySHYrP5bMWtiO3uer5Updjm5yAOeuX9fnUFKH4vwUSc - ">lJ!]@l)yCp>Ἑk'#h7|n aa*Mǻck2)o>LD>VOGIX/1c!QsMTS)dEuc>Ry(Z_ \ No newline at end of file +-> ssh-ed25519 /Gpyew VGIv5je1W6AiulkqG5G25p0TIeJNRNTYLUUpuV89UHk +z+BkqduxSDDFLQ3NasqKvb6V8AN8CA3YYjYV7caj0h0 +-> piv-p256 ewCc3w AopvoViWxs4qnGEWNskuFqMOly3Fzh/ymjHtbRgMW+du +4tf6XUtOcB6ySAdUJxvYFIZ8e1RBir+3cPxRNPqHHZA +-> piv-p256 6CL/Pw Ah7ybTGFJWYo1Acs9ZxCIuVOay1OBETqjrOrKXXxbnAH +DoyqM7vu9Q0Hja59Sw1RhiDS5QPR02gxwPXlp3Iu1ZY +-> ssh-ed25519 I2EdxQ mgYVnLewRv3EPS4Q1wVvQYQWyC+6sB7w/WX7t5vWBkE +kyDdmxmqwLQVOl8MWD/6oMhNvH3RD4m+rjuqf309jno +-> ssh-ed25519 J/iReg +187WiGdOKeB0g+KLx3i4X6JErDUx5572K15e40hiU0 +5XTb/YksFU45FEeR/aCLDthaITTlGhW+g29OiTErS7o +-> ssh-ed25519 GNhSGw eSUPrMYXWLP+zvAKW2QmYWS4NnLgtu8fwO7gSLhW0VM +J1GQSYkDY9KtNbQU9zI3lCMGHuv2DLyoz3YxxCYyNmQ +-> ssh-ed25519 eXMAtA GBL0bxQpgcBlBpIRLexrYntJ05uBiptLRsTDtZtmuzk +VEQb//O/dPd0Jg4PuO/H4uBhrYm8Ttkslqql3T9DeYM +-> ssh-ed25519 5hXocQ JQ7tqAoFurlpjxUhT3zSNjrZ2CICWoUcuHAgz1zDFgs +ssMa1FEF5QJ2F0C6C21A7QLVivm3k3slkVw0UvoiW+s +--- VCsT7GvKPHvJ134XmIbjRSGLXqJhI6ZN8Kz6kkC4wAk +bUsr728 SN 1y}խ{ ELHMKw\G!fiETa%`yTm۞ԇޥCD-2 0ADX?ahDP[ \ No newline at end of file diff --git a/secrets/restic/periodique/base-password.age b/secrets/restic/periodique/base-password.age index 395572e..5f8f4c3 100644 Binary files a/secrets/restic/periodique/base-password.age and b/secrets/restic/periodique/base-password.age differ diff --git a/secrets/restic/periodique/base-repo.age b/secrets/restic/periodique/base-repo.age index 226fc0a..0f1b66e 100644 --- a/secrets/restic/periodique/base-repo.age +++ b/secrets/restic/periodique/base-repo.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 FtI9pg 699sQyv9A2DsVBx0u2Q+StW7VP8+DiUX+uUOZDP9BXc -7xQrHSWDkEGu9iPBx/jiiDmJ8+KRSfeeLqjtSHHIKxk --> piv-p256 ewCc3w Amal1a3gRYmqp2KDdlgN7mWzPzJG4EHeDNbBnDp9ZK75 -LtEh4MK3tpLh/IIjuD+dXzlOeNK2Efgjwy8L43A8/gw --> piv-p256 6CL/Pw Ap5uHl9tOPVkCB5/BqxgKGhtGjVxooNiVAAagKiKfxO1 -zhMl4yVJOe+dzjwcaYQBCjYs47iikeykXFznYAUoF8E --> ssh-ed25519 I2EdxQ KXijPMp2Yb2ccGAfmX/xw3TB+Wcw5+WALWLwE2MUJF0 -X96+UxQo5R8+sZt0uCdauFdnDUP4otRs4QlAVWbS+ys --> ssh-ed25519 J/iReg WZykIiadzSf9FrirQODpSPJc/XMggldDUuAUvSA6kDw -JQeaP8u8fo3l8xbZYGTyEft39KYRVYzPXvtQOk9hhqc --> ssh-ed25519 GNhSGw Iwyy/AoqxB3ZP8L2fh/tIUMo5VhNnB2A2qouHzj34Hs -FFzA/w9lm1EHubBipx6kqQAPw0oBjiFVxkKoZDAqM2g --> ssh-ed25519 eXMAtA fXjp2bJasqd3A0qO8JHThWgchw9Zb2lnAA5ux+z0+Tc -5UIgx+fg1a5qzEeXHmCzVPlUy3T7uwosjDN5DU3acCc --> ssh-ed25519 5hXocQ VaoJWjpaDZXOvPgw0oFWuvFWJm2U/wT2KlgaPG7QggU -NpqFs3pzV91c+5dMcdsjHz3br8jxKg3obeMj1M2NBR4 ---- 1XXLm39XkQcmHtbW2Gxhw+NtGvB6vaZtavkwBYL7sZQ -X&ỵrNg:u!`g3/^11y/-:GS*P7jl& ؠw0>Wg13m-SZҨXi]Zb6%ZTIu1:ҵ33~Nb \ No newline at end of file +-> ssh-ed25519 FtI9pg 84M0DR/waZJecYdVydTblGWiQuPrWmwChaBhvRI8hR0 +yyp1wy2ZlogcYusQWl2+DPgang74L8NjIaLkHeS3ePM +-> piv-p256 ewCc3w A8R+4Jk7X5BsRrwnGYaW2G5C5zP6/EvrOtHLzsYFpQRe +CZ2jCJdv7rzwHM/YXTfdyIR6bwLrjjcWAwzWiOnEi44 +-> piv-p256 6CL/Pw A7k7rUBLLn3KAhOX4+La/EpNs65oLXxDHUqHKKFyxA7/ +WPZxcRI6WmpO0bFt7tO4FQs1W50kN1TajTo8SjkMZhw +-> ssh-ed25519 I2EdxQ ADaaFiOXli3C6TT8vaYdEb68QVugODorRCyHTuyslyc +wmTpGtXYujiod3lBDnnybkiAhlXPQbUN0y6/5WBHj/Q +-> ssh-ed25519 J/iReg QvlPwhiV3V1PeXWDlHyzsiaH19hD9b6f9Ep4iNbTzzw +/jG8Aw9i18uX2kc6eC8hvC9DPOnQOoRtdaaonLG4DZ8 +-> ssh-ed25519 GNhSGw WxQ7FjjFbjwMwG9Xlvg+WH4O9S+1t/UufljELhwL3gU +wd0wEBdy+mKKfMCbXKRvu738sYJdfEX2A6zRJF2Xll4 +-> ssh-ed25519 eXMAtA nnRbMSCpsL9r9T0m+jconJckGxElbAsHOSeIulMIOkQ +nlmUTC6ft7tWUHjDhSvO+wkYKScmfbKQuqEL7pp4SZo +-> ssh-ed25519 5hXocQ uR2akyilpGC39cubQPBiugUBXTQ5OK3BFHDWmFp5dV0 +lcy6gLtsrzZEOK8F0Cz4y4l5Nuudvpp+4ueYA1L0LH4 +--- vMqM0Cl26W6SLxU9QkG6fl22YCFBGzDrir74ZuFTgIM +e7k=Xnd c`:dZTZm$/&6Os$yFozaL+9"ѯhင!@7>Q0}?F-c(ף"CJ_gcg'p#'ss]uUFTѿR1 \ No newline at end of file diff --git a/secrets/restic/redite/base-password.age b/secrets/restic/redite/base-password.age index 3da9a83..ed61d16 100644 Binary files a/secrets/restic/redite/base-password.age and b/secrets/restic/redite/base-password.age differ diff --git a/secrets/restic/redite/base-repo.age b/secrets/restic/redite/base-repo.age index 3ffcc29..96837fc 100644 Binary files a/secrets/restic/redite/base-repo.age and b/secrets/restic/redite/base-repo.age differ diff --git a/secrets/restic/reverseproxy/base-password.age b/secrets/restic/reverseproxy/base-password.age index 297fd73..52f05fc 100644 Binary files a/secrets/restic/reverseproxy/base-password.age and b/secrets/restic/reverseproxy/base-password.age differ diff --git a/secrets/restic/reverseproxy/base-repo.age b/secrets/restic/reverseproxy/base-repo.age index 6a068c8..89e91c1 100644 Binary files a/secrets/restic/reverseproxy/base-repo.age and b/secrets/restic/reverseproxy/base-repo.age differ diff --git a/secrets/restic/two/base-password.age b/secrets/restic/two/base-password.age index 4562140..dbd224e 100644 Binary files a/secrets/restic/two/base-password.age and b/secrets/restic/two/base-password.age differ diff --git a/secrets/restic/two/base-repo.age b/secrets/restic/two/base-repo.age index 8de1bb7..50709b9 100644 Binary files a/secrets/restic/two/base-repo.age and b/secrets/restic/two/base-repo.age differ diff --git a/secrets/restic/vaultwarden/base-password.age b/secrets/restic/vaultwarden/base-password.age index cb0999a..0d20f1f 100644 Binary files a/secrets/restic/vaultwarden/base-password.age and b/secrets/restic/vaultwarden/base-password.age differ diff --git a/secrets/restic/vaultwarden/base-repo.age b/secrets/restic/vaultwarden/base-repo.age index 885f483..0565eac 100644 Binary files a/secrets/restic/vaultwarden/base-repo.age and b/secrets/restic/vaultwarden/base-repo.age differ diff --git a/secrets/reverseproxy/.gitkeep b/secrets/reverseproxy/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/secrets/reverseproxy/.gitkeep @@ -0,0 +1 @@ + diff --git a/secrets/vaultwarden/env.age b/secrets/vaultwarden/env.age index a74fe04..1f51064 100644 Binary files a/secrets/vaultwarden/env.age and b/secrets/vaultwarden/env.age differ