diff --git a/flake.lock b/flake.lock index e08b5a2..02b77ad 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792615934, - "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=", + "lastModified": 1793294725, + "narHash": "sha256-loLMnbbS4KhmG2ln9EY6f0YMNCA273Yx02oWYQ9IMeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36", + "rev": "6f06d204d8f2d8761d9da78778745974a3216381", "type": "github" }, "original": { diff --git a/hosts/physiques/thot/default.nix b/hosts/physiques/thot/default.nix index 27f44b4..af8bacc 100644 --- a/hosts/physiques/thot/default.nix +++ b/hosts/physiques/thot/default.nix @@ -5,6 +5,7 @@ ./hardware-configuration.nix ./networking.nix ./nginx.nix + ./restic.nix ]; networking.hostId = "bbdd1133"; diff --git a/hosts/physiques/thot/info.nix b/hosts/physiques/thot/info.nix index e45b6db..e46cfc5 100644 --- a/hosts/physiques/thot/info.nix +++ b/hosts/physiques/thot/info.nix @@ -2,16 +2,16 @@ name = "thot"; description = "Serveur de backup sous nixos utilisant Restic"; id = 14; - + enable = true; - networking.adm.enable = false; - resticClient.enable = false; - - services = { - resticServer = { - enable = true; - port = 4242; - }; + networking = { + adm.enable = false; }; + + monitoring = { + nginx.enable = true; + }; + + resticClient.enable = false; } diff --git a/hosts/physiques/thot/restic.nix b/hosts/physiques/thot/restic.nix new file mode 100644 index 0000000..16b7936 --- /dev/null +++ b/hosts/physiques/thot/restic.nix @@ -0,0 +1,8 @@ +{ + config.crans.services = { + resticServer = { + enable = true; + port = 4242; + }; + }; +} diff --git a/hosts/vm/README.md b/hosts/vm/README.md index e8cb910..1e14ae5 100644 --- a/hosts/vm/README.md +++ b/hosts/vm/README.md @@ -22,10 +22,6 @@ Serveur stirling (manipulation de PDF), accessible à . Serveur Matrix, bridge IRC <-> Matrix et interface admin pour synapse, accessible à . -## redite - -Serveur redlib (client WEB alternatif pour Reddit), accessible à . - ## reverseproxy Serveur qui héberge un reverseproxy et une instance de anubis. diff --git a/hosts/vm/collabora/info.nix b/hosts/vm/collabora/info.nix index c68b81f..ebe835a 100644 --- a/hosts/vm/collabora/info.nix +++ b/hosts/vm/collabora/info.nix @@ -1,3 +1,4 @@ +{ config, ... }: { name = "collabora"; description = "Collabora du Crans"; @@ -9,5 +10,16 @@ srv-nat.enable = true; }; + reverseproxy.vhosts = { + "collabora" = { + proxyPass = config.networking.adm.ipv4.address; + proxyWebsockets = true; + }; + }; + + monitoring = { + nginx.enable = true; + }; + resticClient.enable = false; } diff --git a/hosts/vm/coturn/coturn.nix b/hosts/vm/coturn/coturn.nix new file mode 100644 index 0000000..643b522 --- /dev/null +++ b/hosts/vm/coturn/coturn.nix @@ -0,0 +1,83 @@ +{ config, lib, ... }: + +{ + age.secrets = { + coturn_auth_secret = { + file = ../../../secrets/common/coturn_auth_secret.age; + mode = "440"; + owner = "turnserver"; + group = "turnserver"; + }; + }; + + # Taken from https://wiki.nixos.org/wiki/Matrix#Coturn_with_Synapse + services.coturn = rec { + enable = true; + no-cli = true; + no-tcp-relay = true; + min-port = 48000; + max-port = 50000; + use-auth-secret = true; + static-auth-secret-file = config.age.secrets.coturn_auth_secret.path; + secure-stun = true; + realm = "coturn.crans.org"; + cert = "${config.security.acme.certs.${realm}.directory}/full.pem"; + pkey = "${config.security.acme.certs.${realm}.directory}/key.pem"; + extraConfig = '' + # for debugging + verbose + # ban private IP ranges + no-multicast-peers + denied-peer-ip=0.0.0.0-0.255.255.255 + denied-peer-ip=10.0.0.0-10.255.255.255 + denied-peer-ip=100.64.0.0-100.127.255.255 + denied-peer-ip=127.0.0.0-127.255.255.255 + denied-peer-ip=169.254.0.0-169.254.255.255 + denied-peer-ip=172.16.0.0-172.31.255.255 + denied-peer-ip=192.0.0.0-192.0.0.255 + denied-peer-ip=192.0.2.0-192.0.2.255 + denied-peer-ip=192.88.99.0-192.88.99.255 + denied-peer-ip=192.168.0.0-192.168.255.255 + denied-peer-ip=198.18.0.0-198.19.255.255 + denied-peer-ip=198.51.100.0-198.51.100.255 + denied-peer-ip=203.0.113.0-203.0.113.255 + denied-peer-ip=240.0.0.0-255.255.255.255 + denied-peer-ip=::1 + denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff + denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255 + denied-peer-ip=100::-100::ffff:ffff:ffff:ffff + denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff + denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff + ''; + }; + + networking.firewall = + let + range = with config.services.coturn; lib.singleton { + from = min-port; + to = max-port; + }; + in + { + enable = true; + allowedUDPPortRanges = range; + allowedUDPPorts = [ 3478 5349 ]; + allowedTCPPortRanges = range; + allowedTCPPorts = [ 3478 5349 ]; + }; + + users.users.turnserver.extraGroups = [ "nginx" ]; + + security.acme.certs.${config.services.coturn.realm} = { + postRun = "systemctl restart coturn.service"; + }; + + services.nginx.virtualHosts = { + ${config.services.coturn.realm} = { + forceSSL = true; + enableACME = true; + }; + }; +} diff --git a/hosts/vm/coturn/default.nix b/hosts/vm/coturn/default.nix new file mode 100644 index 0000000..51fd0d2 --- /dev/null +++ b/hosts/vm/coturn/default.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + imports = [ + ./coturn.nix + ./service.nix + ./livekit.nix + ./hardware-configuration.nix + ]; + + networking.hostName = "coturn"; + boot.loader.grub.devices = [ "/dev/sda" ]; + + services.nginx.enable = true; + + system.stateVersion = "26.05"; +} diff --git a/hosts/vm/redite/hardware-configuration.nix b/hosts/vm/coturn/hardware-configuration.nix similarity index 87% rename from hosts/vm/redite/hardware-configuration.nix rename to hosts/vm/coturn/hardware-configuration.nix index c61d274..3782249 100644 --- a/hosts/vm/redite/hardware-configuration.nix +++ b/hosts/vm/coturn/hardware-configuration.nix @@ -27,11 +27,11 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/6aab06d9-2d09-4929-a680-719c6818a663"; + device = "/dev/disk/by-uuid/e2406ee7-b3ca-4fe0-8b4b-e4a38a1149ca"; fsType = "ext4"; }; - swapDevices = [ { device = "/dev/disk/by-uuid/24f88af8-323d-48e3-8872-402b8bbbdc13"; } ]; + 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 diff --git a/hosts/vm/coturn/info.nix b/hosts/vm/coturn/info.nix new file mode 100644 index 0000000..7d99a69 --- /dev/null +++ b/hosts/vm/coturn/info.nix @@ -0,0 +1,25 @@ +{ + name = "coturn"; + description = "Serveur Web RTC pour les appels du Crans"; + id = 119; + + enable = true; + + networking = { + adm.enable = true; + srv = { + enable = true; + ipv4.address = "185.230.79.19"; + }; + }; + + monitoring = { + nginx.enable = true; + }; + + resticClient.when = "06:07"; + + services = { + acme.enable = true; + }; +} diff --git a/hosts/vm/coturn/livekit.nix b/hosts/vm/coturn/livekit.nix new file mode 100644 index 0000000..8a1a320 --- /dev/null +++ b/hosts/vm/coturn/livekit.nix @@ -0,0 +1,130 @@ +# +# livekit' est un clone du module livekit mais qui permet de spécifier +# les secrets pour la connexion aux serveurs turn par un fichier sur le disque, +# ce qui nous permet d'utiliser agenix pour cela et de ne pas exposer les +# secrets de turn. +# + +{ config, info, pkgs, lib, ... }: + +let + keyFile = "/run/livekit.key"; + domain = "livekit.crans.org"; +in +{ + services.livekit' = { + enable = true; + + openFirewall = true; + + settings = { + port = 8100; + + room.auto_create = true; + + rtc = { + use_external_ip = false; + node_ip = info.networking.srv.ipv4.address; + tcp_port = 8101; + port_range_start = 50000; + port_range_end = 52000; + enable_loopback_candidate = false; + turn_servers = [ + { + host = config.services.coturn.realm; + port = 3478; + protocol = "tcp"; + secretFile = config.age.secrets.coturn_auth_secret.path; + } + { + host = config.services.coturn.realm; + port = 3478; + protocol = "udp"; + secretFile = config.age.secrets.coturn_auth_secret.path; + } + { + host = config.services.coturn.realm; + port = 5349; + protocol = "tls"; + secretFile = config.age.secrets.coturn_auth_secret.path; + } + ]; + }; + + turn.enabled = false; + }; + + inherit keyFile; + }; + + networking.firewall = + let + range = with config.services.livekit'.settings.rtc; lib.singleton { + from = port_range_start; + to = port_range_end; + }; + in + { + allowedUDPPortRanges = range; + allowedUDPPorts = [ 80 443 8100 8101 8102 ]; + allowedTCPPortRanges = range; + allowedTCPPorts = [ 80 443 8100 8101 8102 ]; + }; + + users.users.livekit.extraGroups = [ "turnserver" ]; + + services.lk-jwt-service = { + enable = true; + port = 8102; + + livekitUrl = "wss://${domain}"; + + inherit keyFile; + }; + + systemd.services.livekit-key = { + before = [ + "lk-jwt-service.service" + "livekit.service" + ]; + + wantedBy = [ "multi-user.target" ]; + + path = with pkgs; [ + livekit + coreutils + gawk + ]; + + script = '' + echo "Key missing, generating key" + echo "lk-jwt-service: $(livekit-server generate-keys | tail -1 | awk '{print $3}')" > "${keyFile}" + ''; + serviceConfig.Type = "oneshot"; + unitConfig.ConditionPathExists = "!${keyFile}"; + }; + + systemd.services.lk-jwt-service.environment.LIVEKIT_FULL_ACCESS_HOMESERVERS = "crans.org"; + + services.nginx.virtualHosts."${domain}" = { + enableACME = true; + forceSSL = true; + + locations."~ /(get_token|healthz|sfu/get)" = { + proxyPass = "http://localhost:${toString config.services.lk-jwt-service.port}"; + + # TODO : Restrict CORS or study issues + extraConfig = '' + add_header 'Access-Control-Allow-Methods' 'GET' always; + add_header 'Access-Control-Allow-Methods' 'OPTIONS' always; + add_header 'Access-Control-Allow-Credentials' 'false' always; + add_header 'Vary' 'Origin' always; + ''; + }; + + locations."/" = { + proxyPass = "http://localhost:${toString config.services.livekit'.settings.port}"; + proxyWebsockets = true; + }; + }; +} diff --git a/hosts/vm/coturn/service.nix b/hosts/vm/coturn/service.nix new file mode 100644 index 0000000..8929bfe --- /dev/null +++ b/hosts/vm/coturn/service.nix @@ -0,0 +1,253 @@ + +{ + config, + lib, + pkgs, + utils, + ... +}: +let + cfg = config.services.livekit'; + format = pkgs.formats.json { }; + settings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; + + isLocallyDistributed = config.services.livekit.ingress.enable; +in +{ + options.services.livekit' = { + enable = lib.mkEnableOption "the livekit server"; + package = lib.mkPackageOption pkgs "livekit" { }; + + keyFile = lib.mkOption { + type = lib.types.path; + description = '' + LiveKit key file holding one or multiple application secrets. Use `livekit-server generate-keys` to generate a random key name and secret. + + The file should have the format `: `. + Example: + `lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE` + + Individual key/secret pairs need to be passed to clients to connect to this instance. + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Opens port range for LiveKit on the firewall."; + }; + + redis = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = isLocallyDistributed; + defaultText = "true if any other Livekit component is enabled locally else false"; + description = "Whether to set up a local redis instance."; + }; + + host = lib.mkOption { + type = with lib.types; nullOr str; + default = if cfg.redis.createLocally then "127.0.0.1" else null; + defaultText = "127.0.0.1 if config.services.livekit.redis.createLocally else null"; + description = '' + Address to bind local redis instance to. + ''; + }; + + port = lib.mkOption { + type = with lib.types; nullOr port; + default = null; + description = '' + Port to bind local redis instance to. + ''; + }; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + options = { + port = lib.mkOption { + type = lib.types.port; + default = 7880; + description = "Main TCP port for RoomService and RTC endpoint."; + }; + + redis = { + address = lib.mkOption { + type = with lib.types; nullOr str; + default = if isLocallyDistributed then "${cfg.redis.host}:${toString cfg.redis.port}" else null; + defaultText = lib.literalExpression "Local Redis host/port when a local ingress component is enabled else null"; + example = "redis.example.com:6379"; + description = "Host and port used to connect to a redis instance."; + }; + }; + + rtc = { + port_range_start = lib.mkOption { + type = lib.types.port; + default = 50000; + description = "Start of UDP port range for WebRTC"; + }; + + port_range_end = lib.mkOption { + type = lib.types.port; + default = 51000; + description = "End of UDP port range for WebRTC"; + }; + + use_external_ip = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + When set to true, attempts to discover the host's public IP via STUN. + This is useful for cloud environments such as AWS & Google where hosts have an internal IP that maps to an external one. + ''; + }; + + turn_servers = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { + freeformType = format.type; + options = { + secretFile = lib.mkOption { + type = lib.types.path; + description = '' + Path to a file containing the shared secret of a coturn server. + ''; + }; + }; + }); + default = []; + example = [ + { + host = "coturn.example.com"; + port = 443; + protocol = "tls"; + secretFile = "/run/turn_secret"; + } + ]; + description = '' + An attribute set of turn servers. + ''; + }; + }; + }; + }; + default = { }; + description = '' + LiveKit configuration file expressed in nix. + + For an example configuration, see . + For all possible values, see . + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.redis.createLocally -> cfg.redis.port != null; + message = '' + When `services.livekit.redis.createLocally` is enabled `services.livekit.redis.port` must be configured. + ''; + } + ]; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ + cfg.settings.port + ]; + allowedUDPPortRanges = [ + { + from = cfg.settings.rtc.port_range_start; + to = cfg.settings.rtc.port_range_end; + } + ]; + }; + + # Provision a redis instance, when livekit-ingress (or later livekit-egress) are enabled on the same host + services.redis.servers.livekit = lib.mkIf cfg.redis.createLocally { + enable = true; + bind = cfg.redis.host; + port = cfg.redis.port; + }; + + systemd = { + tmpfiles.settings.livekit = { + "/run/livekit-config.json"."f" = { + mode = "600"; + user = "livekit"; + group = "livekit"; + }; + }; + + services.livekit = { + description = "LiveKit SFU server"; + documentation = [ "https://docs.livekit.io" ]; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + preStart = + let + file = "/run/livekit-config.json"; + in + '' + cat ${format.generate "livekit.json" settings} > ${file} + while $(cat ${file} | ${pkgs.jq}/bin/jq -e 'first((.rtc.turn_servers[]) | select(.secretFile != null)).secretFile != null') + do + secretFile=$(cat ${file} | ${pkgs.jq}/bin/jq -r 'first((.rtc.turn_servers[]) | select(.secretFile != null)).secretFile') + cat ${file} | ${pkgs.jq}/bin/jq "first((.rtc.turn_servers[]) | select(.secretFile != null)).secret = \"$(cat $secretFile)\" | del(first((.rtc.turn_servers[]) | select(.secretFile != null)).secretFile)" > ${file} + done + ''; + + serviceConfig = { + User = "livekit"; + Group = "livekit"; + LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ]; + ExecStart = utils.escapeSystemdExecArgs [ + (lib.getExe cfg.package) + "--config=/run/livekit-config.json" + "--key-file=/run/credentials/livekit.service/livekit-secrets" + ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + ProtectHome = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + Restart = "on-failure"; + RestartSec = 5; + UMask = "077"; + }; + }; + }; + + users = { + users.livekit = { + isSystemUser = true; + group = "livekit"; + }; + groups.livekit = { }; + }; + }; +} diff --git a/hosts/vm/jitsi/info.nix b/hosts/vm/jitsi/info.nix index f070613..3b2b3f9 100644 --- a/hosts/vm/jitsi/info.nix +++ b/hosts/vm/jitsi/info.nix @@ -9,17 +9,17 @@ adm.enable = true; srv = { enable = true; - ipv4 = "185.230.79.15"; + ipv4.address = "185.230.79.15"; }; }; + monitoring = { + nginx.enable = true; + }; + resticClient.when = "02:34"; services = { acme.enable = true; }; - - - public-ssh = ""; - } diff --git a/hosts/vm/livre/info.nix b/hosts/vm/livre/info.nix index 1632dd6..8df46c7 100644 --- a/hosts/vm/livre/info.nix +++ b/hosts/vm/livre/info.nix @@ -1,3 +1,4 @@ +{ config, ... }: { name = "livre"; description = "Editeur de PDF en ligne via Stirling-PDF"; @@ -9,5 +10,20 @@ srv-nat.enable = true; }; + reverseproxy.vhosts = { + "pdf" = { + proxyPass = config.networking.adm.ipv4.address; + aliases = [ + "livre" + "stirling" + "stirling-pdf" + ]; + }; + }; + + monitoring = { + nginx.enable = true; + }; + resticClient.when = "03:45"; } diff --git a/hosts/vm/mediakiwi/info.nix b/hosts/vm/mediakiwi/info.nix index 3097f89..9c83a63 100644 --- a/hosts/vm/mediakiwi/info.nix +++ b/hosts/vm/mediakiwi/info.nix @@ -1,3 +1,4 @@ +{ config, ... }: { name = "mediakiwi"; description = "Wiki du Crans"; @@ -9,5 +10,33 @@ srv-nat.enable = true; }; + reverseproxy.vhosts = { + "mediawiki" = { + anubisConfig = [ + { + name = "allow-mediawiki-images"; + path_regex = "^/w/images/.*"; + action = "ALLOW"; + } + { + name = "allow-mediawiki-api"; + path_regex = "^/w/api.php.*"; + action = "ALLOW"; + } + { + name = "challenge-other"; + path_regex = ".*"; + action = "CHALLENGE"; + } + ]; + proxyPass = config.networking.adm.ipv4.address; + aliases = [ "mediakiwi" ]; + }; + }; + + monitoring = { + nginx.enable = true; + }; + resticClient.when = "06:47"; } diff --git a/hosts/vm/neo/info.nix b/hosts/vm/neo/info.nix index ad068b7..07716d6 100644 --- a/hosts/vm/neo/info.nix +++ b/hosts/vm/neo/info.nix @@ -8,14 +8,17 @@ networking = { srv = { enable = true; - ipv4 = "185.230.79.5"; + ipv4.address = "185.230.79.5"; }; }; + monitoring = { + nginx.enable = true; + }; + resticClient.when = "04:56"; services = { acme.enable = true; - coturn.enable = true; }; } diff --git a/hosts/vm/neo/matrix.nix b/hosts/vm/neo/matrix.nix index ea4127c..e199900 100644 --- a/hosts/vm/neo/matrix.nix +++ b/hosts/vm/neo/matrix.nix @@ -1,5 +1,8 @@ { config, ... }: +let + turn_server = "coturn.crans.org"; +in { age.secrets = { ldap_synapse_password = { @@ -19,11 +22,12 @@ appservice_irc_db_env = { file = ../../../secrets/neo/appservice_irc_db_env.age; + owner = "matrix-synapse"; }; coturn_auth_secret = { - file = ../../../secrets/neo/coturn_auth_secret.age; - owner = "turnserver"; + file = ../../../secrets/common/coturn_auth_secret.age; + owner = "matrix-synapse"; }; }; @@ -124,12 +128,18 @@ ]; turn_uris = [ - "turn:${config.services.coturn.realm}:3478?transport=udp" - "turn:${config.services.coturn.realm}:3478?transport=tcp" + "turn:${turn_server}:3478?transport=udp" + "turn:${turn_server}:3478?transport=tcp" + "turn:${turn_server}:5349?transport=tls" ]; turn_shared_secret = config.age.secrets.coturn_auth_secret.path; turn_user_lifetime = "1h"; + matrix_rtc.transports = [{ + type = "livekit"; + livekit_service_url = "https://livekit.crans.org"; + }]; + app_service_config_files = [ "/var/lib/matrix-appservice-irc/registration.yml" ]; @@ -151,6 +161,11 @@ room_topic = "Salon utilisé par les administrateurs du serveur pour vous envoyer des informations importantes"; auto_join = true; }; + + experimental_features = { + # MatrixRTC + msc4143_enabled = true; + }; }; extraConfigFiles = [ diff --git a/hosts/vm/nextcloud/info.nix b/hosts/vm/nextcloud/info.nix index 598f79a..d6f900b 100644 --- a/hosts/vm/nextcloud/info.nix +++ b/hosts/vm/nextcloud/info.nix @@ -1,3 +1,4 @@ +{ config, ... }: { name = "nextcloud"; description = "Nextcloud du Crans"; @@ -16,7 +17,13 @@ }; }; + reverseproxy.vhosts."nextcloud".proxyPass = config.networking.adm.ipv4.address; + homeAdh.enable = true; + monitoring = { + nginx.enable = true; + }; + resticClient.enable = false; } diff --git a/hosts/vm/periodique/info.nix b/hosts/vm/periodique/info.nix index 489eaff..fa2da9b 100644 --- a/hosts/vm/periodique/info.nix +++ b/hosts/vm/periodique/info.nix @@ -1,3 +1,4 @@ +{ config, lib, ... }: { name = "periodique"; description = "Frontend Matrix du Crans (element)"; @@ -9,5 +10,18 @@ srv-nat.enable = true; }; + reverseproxy.vhosts = { + "element".proxyPass = config.networking.adm.ipv4.address; + "matrix-to".serveLocalFiles = lib.fetchFromCrans { + repo = "matrixto"; + rev = "bd639c5e0d7664dcd44d07ef70abb5f59919f714"; + hash = "sha256-kiK4lGF8RCioKYWoM8CPiDLuESxenXQvo33ns1hDMwc="; + }; + }; + + monitoring = { + nginx.enable = true; + }; + resticClient.when = "02:56"; } diff --git a/hosts/vm/redite/default.nix b/hosts/vm/redite/default.nix deleted file mode 100644 index e80b4e7..0000000 --- a/hosts/vm/redite/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - imports = [ - ./hardware-configuration.nix - ./redlib.nix - ]; - - networking.hostName = "redite"; - boot.loader.grub.devices = [ "/dev/sda" ]; - - system.stateVersion = "23.11"; -} diff --git a/hosts/vm/redite/info.nix b/hosts/vm/redite/info.nix deleted file mode 100644 index 74298d9..0000000 --- a/hosts/vm/redite/info.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - name = "redite"; - description = "Frontend reddit libre"; - id = 139; - - enable = true; - - networking = { - srv-nat.enable = true; - }; - - resticClient.when = "06:18"; -} diff --git a/hosts/vm/redite/redlib.nix b/hosts/vm/redite/redlib.nix deleted file mode 100644 index e569cf6..0000000 --- a/hosts/vm/redite/redlib.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - services.redlib = { - openFirewall = true; - port = 80; - enable = true; - }; -} diff --git a/hosts/vm/reverseproxy/info.nix b/hosts/vm/reverseproxy/info.nix index e2bcf3f..da7699d 100644 --- a/hosts/vm/reverseproxy/info.nix +++ b/hosts/vm/reverseproxy/info.nix @@ -10,10 +10,15 @@ srv = { enable = true; interface = "ens20"; - ipv4 = "185.230.79.42"; + ipv4.address = "185.230.79.42"; }; }; - resticClient.when = "03:42"; + services.acme.enable = true; + monitoring = { + nginx.enable = true; + }; + + resticClient.when = "03:42"; } diff --git a/hosts/vm/reverseproxy/reverseproxy.nix b/hosts/vm/reverseproxy/reverseproxy.nix index d4581c2..a8a0c85 100644 --- a/hosts/vm/reverseproxy/reverseproxy.nix +++ b/hosts/vm/reverseproxy/reverseproxy.nix @@ -1,166 +1,66 @@ { + hosts, pkgs, lib, ... }: let - formatJSON = pkgs.formats.json { }; - formatYAML = pkgs.formats.yaml { }; - inherit (lib.crans) fetchFromCrans; - antiBot = formatYAML.generate "antibot.yaml" [ + anubisChallenge = [ { - name = "whitelist-crans"; - action = "ALLOW"; - remote_addresses = [ - "185.230.79.0/22" - "2a0c:700::/32" - "46.105.102.188/32" - "2001:41d0:2:d5bc::/128" - ]; - } - { - # On refuse les bots qui font souvent de la merde. - # https://github.com/TecharoHQ/anubis/blob/main/data/bots/_deny-pathological.yaml - import = "(data)/bots/_deny-pathological.yaml"; - } - { - # allow google-inspection pour indexer les pages - name = "google-inspection-tool"; - action = "ALLOW"; - user_agent_regex = ".*Google-InspectionTool.*"; - } - { - # On autorise les indexers des moteurs de recherche. - # https://github.com/TecharoHQ/anubis/blob/main/data/crawlers/_allow-good.yaml - import = "(data)/crawlers/_allow-good.yaml"; - } - { - # On autorise l'accès à favicon, robots.txt, well-known, ... - # https://github.com/TecharoHQ/anubis/blob/main/data/common/keep-internet-working.yaml - import = "(data)/common/keep-internet-working.yaml"; - } - { - # On refuse si userAgent = "" - # https://github.com/TecharoHQ/anubis/blob/main/data/common/rfc-violations.yaml - import = "(data)/common/rfc-violations.yaml"; - } - { - # On bloque les AI aggressivement (bots/agent, training et user search par IA) - # https://github.com/TecharoHQ/anubis/blob/main/data/meta/ai-block-aggressive.yaml - import = "(data)/meta/ai-block-aggressive.yaml"; + name = "challenge-other"; + path_regex = "^*"; + action = "CHALLENGE"; } ]; - anubisChallenge = formatJSON.generate "anubis_challenge.json" { - "bots" = [ - { - import = "${antiBot}"; - } - { - name = "challenge-other"; - path_regex = "^*"; - action = "CHALLENGE"; - } - ]; - }; + anubisPerso = [ + { + name = "allow-public"; + path_regex = "^/[a-zA-Z0-9_-]*/public/.*"; + action = "ALLOW"; + } + { + name = "allow-phpmyadmin"; + path_regex = "^/phpmyadmin/.*"; + action = "ALLOW"; + } + { + # geneau utilisait ses pages persos avant la mise en place d'Anubis. + # Le déploiement d'Anubis l'a impacté (cf les mails de fin 2025). + # À titre transitoire, il a été décidé en décembre 2025 de faire une + # exception pour lui permettre de continuer son utilisation des pages + # persos en attente d'une meilleure méthode. + name = "allow-geneau"; + path_regex = "^/geneau/.*"; + action = "ALLOW"; + } + { + name = "challenge-other"; + path_regex = "^.*"; + action = "CHALLENGE"; + } + ]; - anubisAllowOther = formatJSON.generate "anubis_allow.json" { - "bots" = [ - { - import = "${antiBot}"; - } - { - name = "allow-other"; - path_regex = "^*"; - action = "ALLOW"; - } - ]; - }; - - anubisPerso = formatJSON.generate "anubis_perso.json" { - "bots" = [ - { - import = "${antiBot}"; - } - { - name = "allow-public"; - path_regex = "^/[a-zA-Z0-9_-]*/public/.*"; - action = "ALLOW"; - } - { - name = "allow-phpmyadmin"; - path_regex = "^/phpmyadmin/.*"; - action = "ALLOW"; - } - { - # geneau utilisait ses pages persos avant la mise en place d'Anubis. - # Le déploiement d'Anubis l'a impacté (cf les mails de fin 2025). - # À titre transitoire, il a été décidé en décembre 2025 de faire une - # exception pour lui permettre de continuer son utilisation des pages - # persos en attente d'une meilleure méthode. - name = "allow-geneau"; - path_regex = "^/geneau/.*"; - action = "ALLOW"; - } - { - import = "${antiBot}"; - } - { - name = "challenge-other"; - path_regex = "^.*"; - action = "CHALLENGE"; - } - ]; - }; - - anubisMirrors = formatJSON.generate "anubis_mirrors.json" { - "bots" = [ - { - import = "${antiBot}"; - } - { - name = "deny-other"; - path_regex = ".*cdimage-.*"; - action = "ALLOW"; - } - { - name = "allow-repo"; - path_regex = "^...*"; - action = "ALLOW"; - } - { - name = "deny-other"; - path_regex = ".*"; - action = "CHALLENGE"; - } - ]; - }; - - anubisWiki = formatJSON.generate "anubis_wiki.json" { - "bots" = [ - { - import = "${antiBot}"; - } - { - name = "allow-mediawiki-images"; - path_regex = "^/w/images/.*"; - action = "ALLOW"; - } - { - name = "allow-mediawiki-api"; - path_regex = "^/w/api.php.*"; - action = "ALLOW"; - } - { - name = "challenge-other"; - path_regex = ".*"; - action = "CHALLENGE"; - } - ]; - }; + anubisMirrors = [ + { + name = "deny-other"; + path_regex = ".*cdimage-.*"; + action = "ALLOW"; + } + { + name = "allow-repo"; + path_regex = "^...*"; + action = "ALLOW"; + } + { + name = "deny-other"; + path_regex = ".*"; + action = "CHALLENGE"; + } + ]; installPartySite = pkgs.python3Packages.buildPythonApplication { name = "site-install-party"; @@ -208,83 +108,69 @@ in crans = { reverseProxy = { enable = true; - virtualHosts = { + virtualHosts = (lib.concatMapAttrs (_: c: c.reverseproxy.vhosts) hosts) // { "autoconfig".serveLocalFiles = ./staticsites/autoconfig; "cas".proxyPass = "172.16.10.120"; - "collabora" = { - proxyPass = "172.16.10.149"; - proxyWebsockets = true; - }; "eclat" = { - anubisConfig = "${anubisMirrors}"; + anubisConfig = anubisMirrors; httpOnly = true; proxyPass = "172.16.10.104"; }; "eclats" = { - anubisConfig = "${anubisMirrors}"; + anubisConfig = anubisMirrors; proxyPass = "172.16.10.104"; }; - "element".proxyPass = "172.16.10.118"; "ethercalc" = { proxyPass = "172.16.10.133:8000"; - serverAliases = [ "excel" ]; + aliases = [ "excel" ]; }; "framadate".proxyPass = "172.16.10.109"; "grafana" = { proxyPass = "172.16.10.121:3000"; - serverAliases = [ "fyre" ]; + aliases = [ "fyre" ]; }; "imprimante" = { proxyPass = "172.16.10.131"; - serverAliases = [ "helloworld" ]; + aliases = [ "helloworld" ]; }; "intranet" = { proxyPass = "172.16.10.156"; - serverAliases = [ "re2o" ]; + aliases = [ "re2o" ]; }; "install-party" = { - anubisConfig = "${anubisChallenge}"; + anubisConfig = anubisChallenge; serveLocalFiles = "${installPartySite}/site"; - serverAliases = [ + aliases = [ "i-p" "adopteunmanchot" "adopteunpingouin" ]; }; "lists" = { - anubisConfig = "${anubisChallenge}"; + anubisConfig = anubisChallenge; proxyPass = "172.16.10.110"; }; - "mediawiki" = { - anubisConfig = "${anubisWiki}"; - proxyPass = "172.16.10.144"; - serverAliases = [ "mediakiwi" ]; + "matrix-to".serveLocalFiles = fetchFromCrans { + repo = "matrixto"; + rev = "bd639c5e0d7664dcd44d07ef70abb5f59919f714"; + hash = "sha256-kiK4lGF8RCioKYWoM8CPiDLuESxenXQvo33ns1hDMwc="; }; "mirrors" = { - anubisConfig = "${anubisMirrors}"; + anubisConfig = anubisMirrors; proxyPass = "172.16.10.104"; }; "mirror" = { - anubisConfig = "${anubisMirrors}"; + anubisConfig = anubisMirrors; httpOnly = true; proxyPass = "172.16.10.104"; }; "nekorale".globalRedirect = "perso.crans.org/club-nekorale"; - "nextcloud".proxyPass = "172.16.10.146"; - # "owncloud".proxyPass = "172.16.10.136"; + "owncloud".proxyPass = "172.16.10.136"; "pad".proxyPass = "172.16.10.130:9001"; - "pdf" = { - proxyPass = "172.16.10.140"; - serverAliases = [ - "livre" - "stirling" - "stirling-pdf" - ]; - }; "perso" = { - anubisConfig = "${anubisPerso}"; + anubisConfig = anubisPerso; proxyPass = "172.16.10.31"; - serverAliases = [ "clubs" ]; + aliases = [ "clubs" ]; }; "pot-vieux".globalRedirect = "perso.crans.org/club-vieux"; "re2o-dev".proxyPass = "172.16.10.166"; @@ -296,23 +182,19 @@ in "snl".globalRedirect = "perso.crans.org/sonetlumens"; "test-melon".proxyPass = "172.16.10.150:8080"; "tmpad".proxyPass = "172.16.10.130:9002"; - "vaultwarden" = { - proxyPass = "172.16.10.159"; - serverAliases = [ "pass" ]; - }; "webirc".proxyPass = "172.16.10.31:9000"; "webmail" = { proxyPass = "172.16.10.107"; - serverAliases = [ "roundcube" ]; + aliases = [ "roundcube" ]; }; "wiki" = { - anubisConfig = "${anubisChallenge}"; + anubisConfig = anubisChallenge; proxyPass = "172.16.10.161"; - serverAliases = [ "wikipedia" ]; + aliases = [ "wikipedia" ]; }; "_crans-org" = { serveLocalFiles = homepagePkg; - serverAliases = [ "www" ]; + aliases = [ "www" ]; }; "zero".proxyPass = "172.16.10.130"; } // builtins.listToAttrs (map ( @@ -324,19 +206,25 @@ in } ) tmp); }; - - services = { - acme.enable = true; - }; }; # Règle particulières services.nginx.virtualHosts = { "www-alias-crans.org".default = true; - "_crans-org".locations = { - "/_matrix/".proxyPass = "https://matrix.crans.org/_matrix/"; - "/_synapse/".proxyPass = "https://matrix.crans.org/_synapse/"; + "_crans-org" = { + locations = { + "/_matrix/".proxyPass = "https://matrix.crans.org/_matrix/"; + "/_synapse/".proxyPass = "https://matrix.crans.org/_synapse/"; + "/.well-known/matrix/".extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'GET' always; + add_header 'Access-Control-Allow-Methods' 'OPTIONS' always; + add_header 'Access-Control-Allow-Credentials' 'false' always; + add_header 'Vary' 'Origin' always; + ''; + }; }; }; + } diff --git a/hosts/vm/vaultwarden/info.nix b/hosts/vm/vaultwarden/info.nix index 1cf8489..6efcbf0 100644 --- a/hosts/vm/vaultwarden/info.nix +++ b/hosts/vm/vaultwarden/info.nix @@ -1,3 +1,4 @@ +{ config, ... }: { name = "vaultwarden"; description = "Vaultarden du crans, gestionnaire de mot de passe"; @@ -9,5 +10,16 @@ srv-nat.enable = true; }; + reverseproxy.vhosts = { + "vaultwarden" = { + proxyPass = config.networking.adm.ipv4.address; + aliases = [ "pass" ]; + }; + }; + + monitoring = { + nginx.enable = true; + }; + resticClient.when = "04:44"; } diff --git a/infra/default.nix b/infra/default.nix new file mode 100644 index 0000000..e375a62 --- /dev/null +++ b/infra/default.nix @@ -0,0 +1,5 @@ +{ + # XXX: Transformer en module NixOs + vlans = import ./vlans.nix; + switchs = import ./switchs.nix; +} diff --git a/infra/switchs.nix b/infra/switchs.nix new file mode 100644 index 0000000..6e374ae --- /dev/null +++ b/infra/switchs.nix @@ -0,0 +1,6 @@ +[ + "arceus" + "carapuce" + "salameche" + "horst" +] diff --git a/infra/vlans.nix b/infra/vlans.nix new file mode 100644 index 0000000..c37a7f6 --- /dev/null +++ b/infra/vlans.nix @@ -0,0 +1,124 @@ +{ + + srv = { + id = 2; + description = "Réseau public"; + interface = "ens19"; + ipv4 = { + address = "185.230.79.0"; + prefixLength = 26; + routes = [ + { + address = "0.0.0.0"; + via = "185.230.79.62"; + prefixLength = 0; + } + ]; + }; + ipv6 = { + address = "2a0c:700:10::"; + routes = [ + { + address = "::"; + via = "2a0c:700:2::ff:fe00:9902"; + prefixLength = 0; + } + ]; + }; + }; + + srv-nat = { + id = 3; + description = "Réseau derrière un NAT"; + interface = "ens19"; + ipv4.routes = [ + { + address = "0.0.0.0"; + via = "172.16.3.99"; + prefixLength = 0; + } + ]; + ipv6 = { + address = "2a0c:700:3::"; + routes = [ + { + address = "::"; + via = "2a0c:700:3::ff:fe00:9903"; + prefixLength = 0; + } + ]; + }; + }; + + san = { + id = 4; + description = "Accès aux baies de stockages"; + interface = "ens19"; + }; + + ceph = { + id = 6; + description = "Réseau interne à ceph"; + interface = "ens20"; + }; + + adm = { + id = 10; + description = "Réseau interne"; + interface = "ens18"; + }; + + adh = { + id = 12; + description = "Réseau adhérent"; + ipv4 = { + address = "185.230.78.0"; + routes = [ + { + address = "0.0.0.0"; + via = "185.230.78.12"; + prefixLength = 0; + } + ]; + }; + ipv6 = { + address = "2a0c:700:12::"; + prefixLength = 48; + routes = [ + { + address = "::"; + via = "2a0c:700:12::ff:fe00:9912"; + prefixLength = 0; + } + ]; + }; + }; + + adh-adm = { + id = 13; + description = "Réseau d’administration du réseau adhérent"; + }; + + ens = { + id = 2751; + description = "Interconnexion avec l’ENS."; + ipv4 = { + address = "138.231.136.0"; + prefixLength = 29; + }; + ipv6 = null; + }; + + ens-clubs = { + id = 2754; + description = "Réseau clubs interconnecté avec l’ENS"; + ipv6 = null; + }; + + ens-lp = { + id = 2756; + description = "Réseau imprimante interconnecté avec l’ENS"; + ipv6 = null; + }; + +} diff --git a/lib/info.nix b/lib/info.nix index b689add..b9ffef8 100644 --- a/lib/info.nix +++ b/lib/info.nix @@ -3,11 +3,6 @@ let inherit (lib) attrNames - attrsToList - isInt - isString - join - length listToAttrs filter filterAttrs @@ -16,31 +11,9 @@ let nixosSystem readDir warn - warnIf - warnIfNot ; - infoRequired = { - name = isString; - description = isString; - id = isInt; - }; - verifyAttrs = - info: - let - missing = filter (n: !(info ? ${n})) (attrNames infoRequired); - wrongType = filter (n: info ? ${n.name} && !(n.value info.${n.name})) (attrsToList infoRequired); - in - (warnIf ( - length missing > 0 - ) "${info.name}/info.nix : les attributs « ${join ", " missing} » sont manquants") - (warnIf (length wrongType > 0) - "${info.name}/info.nix : les attributs « ${join ", " (map (i: i.name) wrongType)} » sont mal typés" - ) - (warnIfNot ( - (info.isDebian or false) || info ? enable - ) "${info.name}/info.nix : cette machine nix ne définit pas l’attribut enable") - info; + infra = import ../infra; get_hosts_names = path: attrNames (filterAttrs (name: type: type == "directory") (readDir path)); get_info = path: @@ -51,7 +24,15 @@ let filePath = path + "/${name}/info.nix"; in if builtins.pathExists filePath then - verifyAttrs (import filePath) + (lib.evalModules { + modules = [ + ../modules/info + filePath + ]; + specialArgs = { + inherit infra; + }; + }).config else warn "${toString filePath} not found" null ) (get_hosts_names path) @@ -67,10 +48,10 @@ rec { nixosSystem { specialArgs = inputs // { hosts = all_hosts; + inherit info infra; }; modules = [ (path + "/${name}") - ({ ... }: { config.crans = info; }) ] ++ baseModules; } diff --git a/modules/crans/default.nix b/modules/crans/default.nix index 4f28495..ee6e5aa 100644 --- a/modules/crans/default.nix +++ b/modules/crans/default.nix @@ -1,13 +1,12 @@ -{ lib, config, ... }: +{ + lib, + info, + ... +}: let - cfg = config.crans; - inherit (lib) - mkEnableOption - mkOption mkIf - types optional ; in @@ -21,76 +20,22 @@ in ./ntp.nix ./restic_client.nix ./monitoring.nix + ./motd.nix ./nullmailer.nix ./packages.nix ./ssh.nix ./store.nix ./users.nix - ./vlans.nix ./virtualisation.nix ]; - options.crans = { - enable = mkEnableOption "Configuration commune à toutes les machines du Crans"; - - name = mkOption { - type = types.str; - example = "vm-test"; - description = "Nom de la machine"; - }; - - isVm = mkOption { - type = types.bool; - description = "Est-ce une machine virtuelle ?"; - }; - - isDebian = mkOption { - type = types.bool; - default = false; - example = "true"; - description = "Est-ce une machine Debian ?"; - }; - - description = mkOption { - type = types.str; - example = "VM de test"; - description = "Description de la machine"; - }; - - id = mkOption { - type = types.int; - example = 135; - description = '' - ID de la machine : - - < 100 machine physique - - >= 100 VM ( id de la VM dans proxmox ) - ''; - }; - - public-ssh = mkOption { - type = types.str; - description = "Clé ssh public de la machine"; - }; - }; - - config = mkIf cfg.enable { - crans = { - homeNounou.enable = lib.mkDefault true; - monitoring.enable = true; - networking = { - enable = lib.mkDefault true; - adm.enable = lib.mkDefault true; - }; - resticClient.enable = lib.mkDefault true; - users = { - ldap.enable = true; - }; - }; + # Options ../info/meta.nix + config = mkIf info.enable { warnings = ( optional ( - cfg.isVm != (cfg.id >= 100) - ) "${cfg.name}: isVm (${toString cfg.isVm}) est incohérent avec son id (${toString cfg.id})" + info.isVm != (info.id >= 100) + ) "${info.name}: isVm (${toString info.isVm}) est incohérent avec son id (${toString info.id})" ); }; } diff --git a/modules/crans/home.nix b/modules/crans/home.nix index e2e4bab..57cc051 100644 --- a/modules/crans/home.nix +++ b/modules/crans/home.nix @@ -1,24 +1,14 @@ -{ lib, config, ... }: +{ lib, info, ... }: let - cfg = config.crans; - - inherit (lib) mkEnableOption mkIf; + inherit (lib) mkIf; in { - options.crans = { - homeNounou = { - enable = mkEnableOption "Monter /home_nounou."; - }; - homeAdh = { - enable = mkEnableOption "Monter /home-adh"; - }; - }; - + # Options ../info/home.nix config = { fileSystems = { - home_nounou = mkIf cfg.homeNounou.enable { + home_nounou = mkIf info.homeNounou.enable { mountPoint = "/home_nounou"; device = "172.16.10.1:/pool/home"; fsType = "nfs"; @@ -28,10 +18,10 @@ in ]; }; - home_adh = mkIf cfg.homeAdh.enable { + home_adh = mkIf info.homeAdh.enable { mountPoint = "/home-adh"; device = "172.16.4.2:/pool/home"; - fsType = "nfs"; + fsType = "nfs"; }; }; }; diff --git a/modules/crans/monitoring.nix b/modules/crans/monitoring.nix index 18862cf..f0ee161 100644 --- a/modules/crans/monitoring.nix +++ b/modules/crans/monitoring.nix @@ -1,32 +1,28 @@ -{ config, lib, ... }: +{ + config, + info, + lib, + ... +}: let - cfg = config.crans.monitoring; + cfg = info.monitoring; - inherit (lib) - mkEnableOption - mkIf - mkOption - types - ; + nginxEnable = config.services.nginx.enable; + inherit (lib) mkIf optional; + + boolToStr = b: if b then "true" else "false"; in { - options.crans.monitoring = { - enable = mkEnableOption "Monitoring prometheus de la machine."; + # Options ../info/monitoring.nix - nginx = { - enable = mkOption { - type = types.bool; - default = config.services.nginx.enable; - example = true; - description = "Monitoring de Nginx par prometheus."; - }; - }; - }; + config = { + warnings = optional (cfg.enable && (nginxEnable != cfg.nginx.enable)) '' + ${info.name} : config.services.nginx.enable (${boolToStr nginxEnable}) n’est pas cohérent avec le monitoring déclaré dans l’info.nix (${boolToStr cfg.nginx.enable}) + ''; - config = mkIf cfg.enable { - services.prometheus.exporters = { + services.prometheus.exporters = mkIf cfg.enable { node = { enable = true; port = 9100; diff --git a/modules/crans/motd.nix b/modules/crans/motd.nix new file mode 100644 index 0000000..d23a54a --- /dev/null +++ b/modules/crans/motd.nix @@ -0,0 +1,19 @@ +{ self, lib, ... }: +let + inherit (lib) removeSuffix; +in +{ + users.motd = + let + shortRev = self.shortRev or self.dirtyShortRev or "inconnue"; + rev = self.rev or (removeSuffix "-dirty" (self.dirtyRev or "inconnue")); + isDirty = !(self ? rev); + in + '' + ${ + if isDirty then "!! DIRTY !! " else "" + }Version déployée ${shortRev}, modifiée le ${self.lastModifiedDate or "??"}. + + https://gitlab.crans.org/nounous/nixos/-/commit/${rev} + ''; +} diff --git a/modules/crans/networking.nix b/modules/crans/networking.nix index 99e20b1..e3cb361 100644 --- a/modules/crans/networking.nix +++ b/modules/crans/networking.nix @@ -1,91 +1,26 @@ { lib, - config, - hosts, + infra, + info, ... }: let - cfg = config.crans; - cfg-net = cfg.networking; + cfg-net = info.networking; inherit (lib) - mkEnableOption mkIf - mkOption mkDefault - types - mod - mapAttrs mapAttrs' filterAttrs - mergeAttrsList - optional - fixedWidthString nameValuePair ; in { - options.crans.networking = { - enable = mkEnableOption "Configuration réseaux commune à toutes les machines du Crans."; - } - // mapAttrs ( - vlan: conf: - let - vlanId = mod conf.id 100; - in - mergeAttrsList ( - [ - { - enable = mkEnableOption "Activation du réseau ${vlan}"; - - interface = mkOption { - type = types.str; - description = "Interface pour le réseau ${vlan}"; - default = conf.interface; - }; - - defaultRoutes = mkOption { - type = types.bool; - default = true; - description = "Configuration par défaut des routes de ${vlan}"; - }; - } - ] - ++ optional ((conf.ipv4 or true) != null) { - ipv4 = mkOption { - type = types.str; - description = "Adresse IPv4 de la machine sur le réseau ${vlan}"; - default = "172.16.${toString vlanId}.${toString cfg.id}"; - }; - } - ++ optional ((conf.ipv6 or true) != null) ( - let - # XXX: Utilisation du masque pour le déterminer à la place ? - prefix = - if lib.hasPrefix "2a0c:700" conf.ipv6.address then - "2a0c:700" - else if lib.hasPrefix "fd00:0:0" conf.ipv6.address then - "fd00:0:0" - else - (builtins.warn "Le prefixe de ${conf.ipv6.address} n’est pas reconnu"); - in - { - ipv6 = mkOption { - type = types.str; - description = "Adresse IPv6 de la machine sur le réseau ${vlan}"; - default = "${prefix}:${toString vlanId}::ff:fe0${toString (cfg.id / 100)}:${toString (mod cfg.id 100)}${ - fixedWidthString 2 "0" (toString vlanId) - }"; - }; - } - ) - ) - ) cfg.vlans; - + # Options ../info/networking.nix config = mkIf cfg-net.enable { networking = { - hostName = cfg.name; + hostName = info.name; useDHCP = false; firewall.enable = mkDefault false; nameservers = [ @@ -95,24 +30,24 @@ in ]; interfaces = mapAttrs' ( - vlan: vconf: + vname: _: let - conf = cfg-net.${vlan}; + conf = cfg-net.${vname}; in nameValuePair conf.interface ( # On itère ipv4 / ipv6 builtins.mapAttrs ( ipvx: _: - mkIf (vconf.${ipvx} != null) { + mkIf (conf.${ipvx} != null) { addresses = [ { - address = conf.${ipvx}; - prefixLength = vconf.${ipvx}.prefixLength; + address = conf.${ipvx}.address; + prefixLength = conf.${ipvx}.prefixLength; } ]; - routes = mkIf conf.defaultRoutes vconf.${ipvx}.routes; + routes = conf.${ipvx}.routes; } ) { @@ -120,7 +55,7 @@ in "ipv6" = null; } ) - ) (filterAttrs (n: _: cfg-net.${n}.enable) cfg.vlans); # On filtre les interfaces désactivées. + ) (filterAttrs (n: _: cfg-net.${n}.enable) infra.vlans); # On filtre les interfaces désactivées. }; }; } diff --git a/modules/crans/restic_client.nix b/modules/crans/restic_client.nix index b0b3228..05f530c 100644 --- a/modules/crans/restic_client.nix +++ b/modules/crans/restic_client.nix @@ -1,40 +1,18 @@ -{ config, lib, ... }: +{ + config, + info, + lib, + ... +}: let - cfg = config.crans.resticClient; + cfg = info.resticClient; - inherit (lib) - mkEnableOption - mkIf - mkOption - types - ; + inherit (lib) mkIf; in { - options.crans.resticClient = { - enable = mkEnableOption "Configuration générale pour le client restic."; - - additionalPaths = mkOption { - type = types.listOf types.path; - default = [ ]; - example = [ "/backup" ]; - description = "Chemins à backuper en plus de ceux par défaut."; - }; - - additionalExcludes = mkOption { - type = types.listOf types.path; - default = [ ]; - example = [ "/var/lib//cache" ]; - description = "Chemins à exclure des backups en plus de ceux par défaut."; - }; - - when = mkOption { - type = types.str; - example = "05:42"; - description = "À quelle heure faire les backups."; - }; - }; + # Options ../info/resticClient.nix config = mkIf cfg.enable { age.secrets = { @@ -52,11 +30,13 @@ in paths = [ "/etc" "/var" - ] ++ cfg.additionalPaths; + ] + ++ cfg.additionalPaths; exclude = [ "/var/cache" "/var/lib/lxcfs" - ] ++ cfg.additionalExcludes; + ] + ++ cfg.additionalExcludes; timerConfig = { OnCalendar = cfg.when; RandomizedDelaySec = "6h"; diff --git a/modules/crans/users.nix b/modules/crans/users.nix index 9c14880..02802ee 100644 --- a/modules/crans/users.nix +++ b/modules/crans/users.nix @@ -1,35 +1,9 @@ -{ - config, - lib, - self, - ... -}: - +{ config, info, ... }: let - cfg = config.crans.users; - - inherit (lib) - mkEnableOption - mkOption - types - ; + cfg = info.users; in - { - options.crans.users = { - ldap = { - enable = mkEnableOption "Authentification par le LDAP adm."; - }; - - root = { - passwordFile = mkOption { - type = types.path; - default = ../../secrets/common/root.age; - example = ../../secrets/apprentix/root.age; - description = "Fichier chiffré par age contenant le mot de passe root."; - }; - }; - }; + # Options : ../info/users.nix config = { age.secrets.root-passwd-hash = { @@ -39,20 +13,6 @@ in users = { mutableUsers = false; - motd = - let - shortRev = self.shortRev or self.dirtyShortRev or "inconnue"; - rev = self.rev or (lib.strings.removeSuffix "-dirty" (self.dirtyRev or "inconnue")); - isDirty = !(self ? rev); - in - '' - ${ - if isDirty then "!! DIRTY !! " else "" - }Version déployée ${shortRev}, modifiée le ${self.lastModifiedDate or "??"}. - - https://gitlab.crans.org/nounous/nixos/-/commit/${rev} - ''; - users.root = { hashedPasswordFile = config.age.secrets.root-passwd-hash.path; }; diff --git a/modules/crans/vlans.nix b/modules/crans/vlans.nix deleted file mode 100644 index c535aa8..0000000 --- a/modules/crans/vlans.nix +++ /dev/null @@ -1,230 +0,0 @@ -{ lib, ... }: -let - inherit (lib) - mkOption - types - mkDefault - mkForce - ; - - vlanConf = { - - srv = { - id = 2; - description = "Réseau public"; - interface = "ens19"; - ipv4 = { - address = mkForce "185.230.79.0"; - prefixLength = 26; - routes = [ - { - address = "0.0.0.0"; - via = "185.230.79.62"; - prefixLength = 0; - } - ]; - }; - ipv6 = { - address = mkForce "2a0c:700:10::"; - routes = [ - { - address = "::"; - via = "2a0c:700:2::ff:fe00:9902"; - prefixLength = 0; - } - ]; - }; - }; - - srv-nat = { - id = 3; - description = "Réseau derrière un NAT"; - interface = "ens19"; - ipv4.routes = [ - { - address = "0.0.0.0"; - via = "172.16.3.99"; - prefixLength = 0; - } - ]; - ipv6 = { - address = mkForce "2a0c:700:3::"; - routes = [ - { - address = "::"; - via = "2a0c:700:3::ff:fe00:9903"; - prefixLength = 0; - } - ]; - }; - }; - - san = { - id = 4; - description = "Accès aux baies de stockages"; - interface = "ens19"; - }; - - ceph = { - id = 6; - description = "Réseau interne à ceph"; - interface = "ens20"; - }; - - adm = { - id = 10; - description = "Réseau interne"; - interface = "ens18"; - }; - - adh = { - id = 12; - description = "Réseau adhérent"; - ipv4 = { - address = mkForce "185.230.78.0"; - routes = [ - { - address = "0.0.0.0"; - via = "185.230.78.12"; - prefixLength = 0; - } - ]; - }; - ipv6 = { - address = mkForce "2a0c:700:12::"; - prefixLength = 48; - routes = [ - { - address = "::"; - via = "2a0c:700:12::ff:fe00:9912"; - prefixLength = 0; - } - ]; - }; - }; - - adh-adm = { - id = 13; - description = "Réseau d’administration du réseau adhérent"; - }; - - ens = { - id = 2751; - description = "Interconnexion avec l’ENS."; - ipv4 = { - address = mkForce "138.231.136.0"; - prefixLength = 29; - }; - ipv6 = null; - }; - - ens-clubs = { - id = 2754; - description = "Réseau clubs interconnecté avec l’ENS"; - ipv6 = null; - }; - - ens-lp = { - id = 2756; - description = "Réseau imprimante interconnecté avec l’ENS"; - ipv6 = null; - }; - - }; - - ipOpt = - v: - let - maxPrefix = if v == 4 then 32 else 128; - in - types.submodule { - options = { - address = mkOption { - type = types.str; - description = "Adresses IPv${v} du réseau"; - }; - - prefixLength = mkOption { - type = types.ints.between 0 maxPrefix; - default = if v == 4 then 24 else 64; - description = "Prefixe du réseau"; - }; - - routes = mkOption { - default = [ ]; - description = "Routes par défaut"; - example = [ - { - address = "0.0.0.0"; - via = "172.16.3.99"; - prefixLength = 0; - } - ]; - type = types.listOf ( - types.submodule { - options = { - address = mkOption { type = types.str; }; - via = mkOption { type = types.str; }; - prefixLength = mkOption { type = types.ints.between 0 maxPrefix; }; - }; - } - ); - }; - }; - }; -in -{ - options.crans.vlans = mkOption { - type = types.attrsOf ( - types.submodule { - options = { - id = mkOption { - type = types.int; - example = "10"; - description = "Id du VLAN"; - }; - - description = mkOption { - type = types.str; - description = "Description du VLAN"; - }; - - interface = mkOption { - type = types.nullOr types.str; - default = null; - example = "ens19"; - description = "Interface par défaut du VLAN"; - }; - - ipv4 = mkOption { - type = types.nullOr (ipOpt 4); - description = "Réseau IPv4 du VLAN."; - }; - - ipv6 = mkOption { - type = types.nullOr (ipOpt 6); - description = "Réseau IPv6 du VLAN."; - }; - }; - } - ); - }; - - config.crans.vlans = ( - builtins.mapAttrs ( - vlan: conf: - let - vlan = lib.mod conf.id 100; - in - lib.mkMerge ( - [ conf ] - ++ lib.optional ((conf.ipv4 or true) != null) { - ipv4.address = mkDefault "172.16.${toString vlan}.0"; - } - ++ lib.optional ((conf.ipv6 or true) != null) { - ipv6.address = mkDefault "fd00:0:0:${toString vlan}::"; - } - ) - ) vlanConf - ); -} diff --git a/modules/info/acme.nix b/modules/info/acme.nix new file mode 100644 index 0000000..349f677 --- /dev/null +++ b/modules/info/acme.nix @@ -0,0 +1,7 @@ +{ lib, ... }: +let + inherit (lib) mkEnableOption; +in +{ + options.services.acme.enable = mkEnableOption "Activer les certificats ACME via let's encrypt."; +} diff --git a/modules/info/default.nix b/modules/info/default.nix new file mode 100644 index 0000000..8fd8502 --- /dev/null +++ b/modules/info/default.nix @@ -0,0 +1,44 @@ +{ lib, config, ... }: +let + inherit (lib) + mkDefault + mkOption + mkIf + types + ; +in +# L’évaluation se fait en deux passes. +# 1. La flake.nix avec la lib/info.nix évalue les info.nix +# 2. Les VMs évaluent la conf en partant de cette évaluation en paramètre +# (anisi que celles des autres machines) +{ + imports = [ + ./acme.nix + ./home.nix + ./meta.nix + ./monitoring.nix + ./networking.nix + ./resticClient.nix + ./reverseproxy.nix + ./users.nix + ]; + options.enable = mkOption { + type = types.bool; + example = true; + description = "Activer la configuration Crans par défaut"; + # On n’utilise pas mkEnableOption pour forcer la définition de enable à true + # ou false (et limiter les oublis) + }; + config = mkIf config.enable { + homeNounou.enable = mkDefault true; + monitoring.enable = mkDefault true; + networking = { + enable = mkDefault true; + adm.enable = mkDefault true; + }; + resticClient.enable = mkDefault true; + users = { + ldap.enable = mkDefault true; + }; + }; +} diff --git a/modules/info/home.nix b/modules/info/home.nix new file mode 100644 index 0000000..cf3816c --- /dev/null +++ b/modules/info/home.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +let + inherit (lib) mkEnableOption; +in +{ + options = { + homeNounou.enable = mkEnableOption "Monter /home_nounou."; + homeAdh.enable = mkEnableOption "Monter /home-adh."; + }; +} diff --git a/modules/info/meta.nix b/modules/info/meta.nix new file mode 100644 index 0000000..ef5cab8 --- /dev/null +++ b/modules/info/meta.nix @@ -0,0 +1,43 @@ +{ lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options = { + name = mkOption { + type = types.str; + description = "Nom de la machine."; + }; + + description = mkOption { + type = types.str; + description = "Description de la machine."; + }; + + id = mkOption { + type = types.int; + example = 135; + description = " + ID de la machine : + - < 100 machine physique + - >= 100 VM ( id de la VM dans proxmox ) + "; + }; + + isVm = mkOption { + type = types.bool; + description = "Est-ce une machine virtuelle ?"; + }; + + isDebian = mkOption { + type = types.bool; + description = "Est-ce que c’est une machine sous Debian ?"; + default = false; + }; + + public-ssh = mkOption { + type = types.str; + description = "Clé ssh publique de la machine."; + }; + }; +} diff --git a/modules/info/monitoring.nix b/modules/info/monitoring.nix new file mode 100644 index 0000000..181abb5 --- /dev/null +++ b/modules/info/monitoring.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +let + inherit (lib) mkEnableOption mkOption types; +in +{ + options.monitoring = { + enable = mkEnableOption "Monitoring prometheus de la machine."; + + nginx = { + enable = mkOption { + type = types.bool; + example = true; + description = "Monitoring de Nginx par prometheus."; + default = false; + }; + }; + }; +} diff --git a/modules/info/networking.nix b/modules/info/networking.nix new file mode 100644 index 0000000..1bec29c --- /dev/null +++ b/modules/info/networking.nix @@ -0,0 +1,148 @@ +{ + config, + infra, + lib, + ... +}: +let + inherit (lib) + fixedWidthString + hasPrefix + listToAttrs + mapAttrs + mergeAttrsList + mod + mkEnableOption + mkOption + optional + optionalAttrs + nameValuePair + types + ; + + switchOptions = listToAttrs ( + map ( + n: + nameValuePair n (mkOption { + type = types.nullOr types.int; + description = "Port sur le switch ${n}"; + default = null; + }) + ) infra.switchs + ); + + routesType = types.listOf ( + types.submodule { + options = { + address = mkOption { + type = types.str; + description = "Réseau de destination"; + }; + prefixLength = mkOption { + type = types.int; + description = "Masque du réseau de destination"; + }; + via = mkOption { + type = types.str; + description = "Ip de la gateway"; + }; + }; + } + ); +in +{ + options = { + ilo.id = mkOption { + type = types.nullOr types.int; + description = "Identifiant de l’ilo"; + default = null; + }; + ilo.switch = switchOptions; + + # TODO: vérifier que les IPs déclarées sont bien dans le réseau vlan (masque) + networking = { + enable = mkEnableOption "Activation du réseau Crans"; + switch = switchOptions; + } + // mapAttrs ( + vname: vconf: + mergeAttrsList ( + [ + { + enable = mkEnableOption "Activation du réseau ${vname}"; + + interface = mkOption { + type = types.str; + description = "Interface pour le réseau ${vname}"; + default = vconf.interface; + }; + + tag = mkOption { + type = types.int; + description = "Tag du vlan"; + readOnly = true; + default = vconf.id; + }; + } + ] + ++ optional ((vconf.ipv4 or { }) != null) { + ipv4.address = + mkOption { + type = types.str; + description = "Adresse IPv4 de la machine sur le réseau ${vname}"; + } + // (optionalAttrs (hasPrefix "172.16" (vconf.ipv4.address or "172.16.0.0")) { + default = "172.16.${toString vconf.id}.${toString config.id}"; + }); + + ipv4.prefixLength = mkOption { + type = types.int; + description = "Masque IPv4 de la machine sur le réseau ${vname}"; + default = vconf.ipv4.prefixLength or 24; + }; + + ipv4.routes = mkOption { + type = routesType; + description = "Routes de l’interface"; + default = vconf.ipv4.routes or [ ]; + }; + } + ++ optional ((vconf.ipv6 or { }) != null) ( + let + # XXX: Utilisation du masque pour le déterminer à la place ? + prefix = + if !(vconf ? ipv6) || lib.hasPrefix "fd00:0:0" vconf.ipv6.address then + "fd00:0:0" + else if lib.hasPrefix "2a0c:700" vconf.ipv6.address then + "2a0c:700" + else + (builtins.warn "Le prefixe de ${vconf.ipv6.address} n’est pas reconnu"); + in + { + ipv6.address = mkOption { + type = types.str; + description = "Adresse IPv6 de la machine sur le réseau ${vname}"; + default = "${prefix}:${toString vconf.id}::ff:fe0${toString (config.id / 100)}:${toString (mod config.id 100)}${ + fixedWidthString 2 "0" (toString vconf.id) + }"; + }; + + ipv6.prefixLength = mkOption { + type = types.int; + description = "Masque IPv6 de la machine sur le réseau ${vname}"; + default = vconf.ipv6.prefixLength or 64; + }; + + ipv6.routes = mkOption { + type = routesType; + description = "Routes de l’interface"; + default = vconf.ipv6.routes or [ ]; + }; + } + ) + ) + ) infra.vlans + + ; + }; +} diff --git a/modules/info/resticClient.nix b/modules/info/resticClient.nix new file mode 100644 index 0000000..252f44d --- /dev/null +++ b/modules/info/resticClient.nix @@ -0,0 +1,29 @@ +{ lib, ... }: +let + inherit (lib) mkEnableOption mkOption types; +in +{ + options.resticClient = { + enable = mkEnableOption "Configuration générale pour le client restic."; + + additionalPaths = mkOption { + type = types.listOf types.path; + default = [ ]; + example = [ "/backup" ]; + description = "Chemins à backuper en plus de ceux par défaut."; + }; + + additionalExcludes = mkOption { + type = types.listOf types.path; + default = [ ]; + example = [ "/var/lib//cache" ]; + description = "Chemins à exclure des backups en plus de ceux par défaut."; + }; + + when = mkOption { + type = types.str; + example = "05:42"; + description = "À quelle heure faire les backups."; + }; + }; +} diff --git a/modules/info/reverseproxy.nix b/modules/info/reverseproxy.nix new file mode 100644 index 0000000..2faa2b7 --- /dev/null +++ b/modules/info/reverseproxy.nix @@ -0,0 +1,29 @@ +# Info des endpoints à Reverseproxy +# Ne pas confondre avec ../services/reverseproxy.nix qui +# définit le service de reverseproxy à proprement parlé +# Les options font parties d’évaluation différentes et ne sont donc pas +# conflictuelles. +{ lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options.reverseproxy = { + vhosts = mkOption { + type = types.attrsOf (types.submodule ./reverseproxyVhost.nix); + description = '' + Hosts virtuels à reverseproxer. + ''; + default = { }; + example = { + "framadate" = { + host = "176.16.10.128:8000"; + aliases = [ + "everything" + "voyager" + ]; + }; + }; + }; + }; +} diff --git a/modules/info/reverseproxyVhost.nix b/modules/info/reverseproxyVhost.nix new file mode 100644 index 0000000..cff2954 --- /dev/null +++ b/modules/info/reverseproxyVhost.nix @@ -0,0 +1,74 @@ +# A virtual host for the reverseproxy +{ lib, ... }: +let + inherit (lib) mkOption types; +in +{ + options = { + + aliases = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Définit des alias de redirection. + ''; + example = [ + "everything" + "voyager" + ]; + }; + + proxyPass = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Endpoint de destination à exposer. + ''; + example = "172.16.10.128:8000"; + }; + + serveLocalFiles = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Chemin vers un dossier à exposer statiquement. + ''; + example = "/var/local/www"; + }; + + globalRedirect = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Redirection vers une autre adresse. + ''; + }; + + anubisConfig = mkOption { + type = types.nullOr (types.listOf types.attrs); + default = null; + description = '' + Configuration pour anubis + ''; + }; + + httpOnly = mkOption { + type = types.bool; + default = false; + description = '' + Interdit les connexions en https + ''; + example = "true"; + }; + + proxyWebsockets = mkOption { + type = types.bool; + default = false; + description = '' + Activer les websockets + ''; + example = "true"; + }; + + }; +} diff --git a/modules/info/users.nix b/modules/info/users.nix new file mode 100644 index 0000000..d6d0e8b --- /dev/null +++ b/modules/info/users.nix @@ -0,0 +1,20 @@ +{ lib, ... }: +let + inherit (lib) mkEnableOption mkOption types; +in +{ + options.users = { + ldap = { + enable = mkEnableOption "Authentification par le LDAP adm."; + }; + + root = { + passwordFile = mkOption { + type = types.path; + default = ../../secrets/common/root.age; + example = ../../secrets/apprentix/root.age; + description = "Fichier chiffré par agenix contenant le mot de passe root."; + }; + }; + }; +} diff --git a/modules/services/acme.nix b/modules/services/acme.nix index f08bd9a..d9f6eb6 100644 --- a/modules/services/acme.nix +++ b/modules/services/acme.nix @@ -1,16 +1,18 @@ -{ config, lib, ... }: +{ + config, + info, + lib, + ... +}: let - cfg = config.crans.services.acme; + cfg = info.services.acme; - inherit (lib) mkEnableOption mkIf; + inherit (lib) mkIf; in { - options.crans.services.acme = { - enable = mkEnableOption "Activer les certificats ACME via let's encrypt."; - }; - + # Options : ../info/acme.nix config = mkIf cfg.enable { age.secrets = { acme-env.file = ../../secrets/acme/env.age; diff --git a/modules/services/anubis.nix b/modules/services/anubis.nix new file mode 100644 index 0000000..9348b13 --- /dev/null +++ b/modules/services/anubis.nix @@ -0,0 +1,133 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) + types + mkEnableOption + mkIf + mkOption + ; + + cfg = config.crans.anubis; +in +{ + options.crans.anubis = { + enable = mkEnableOption "Configuration d’Anubis du Crans."; + useRedis = mkEnableOption "Utilisation de Redis pour sauvegarder les challenges"; + instances = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + hostname = mkOption { + type = types.str; + example = "wiki.crans.org"; + description = '' + Hostname to redirect to. + ''; + }; + bind = mkOption { + type = types.str; + example = "/run/anubis/anubis-wiki/socket.sock"; + description = '' + Where Anubis should listen + ''; + }; + bots = mkOption { + type = types.listOf types.attrs; + description = '' + Anubis bot policy. + ''; + }; + }; + } + ); + }; + }; + + config = mkIf cfg.enable { + age.secrets.anubis-secret = mkIf cfg.enable { + file = ../../secrets/reverseproxy/anubis-secret.age; + owner = "anubis"; + }; + + services.anubis = { + defaultOptions.group = "nginx"; + instances = lib.mapAttrs (name: conf: { + enable = true; + policy = { + settings = { + statusCodes = { + CHALLENGE = 200; + DENY = 403; + }; + logging = { + sink = "stdio"; + level = "WARN"; + }; + store = + let + redCfg = config.services.redis.servers.anubis; + in + mkIf cfg.useRedis { + backend = "valkey"; + parameters.url = "redis://${redCfg.bind}:${toString redCfg.port}/0"; + }; + }; + extraBots = [ + { + name = "whitelist-crans"; + action = "ALLOW"; + remote_addresses = [ + "185.230.79.0/22" + "2a0c:700::/32" + "46.105.102.188/32" + "2001:41d0:2:d5bc::/128" + ]; + } + { + # https://github.com/TecharoHQ/anubis/blob/main/data/botPolicies.yaml + import = "(data)/meta/default-config.yaml"; + } + { + # On refuse si userAgent = "" + # https://github.com/TecharoHQ/anubis/blob/main/data/common/rfc-violations.yaml + import = "(data)/common/rfc-violations.yaml"; + } + ] + ++ conf.bots; + # Inclus via l’import de default-config.yaml. Et on préfére mettre le + # whitelist Crans avant. + useDefaultBotRules = false; + }; + settings = { + BIND = conf.bind; + BIND_NETWORK = "unix"; + METRIC_BIND = "/run/anubis/anubis-${name}/metrics.sock"; + TARGET = " "; # Subrequest authentification. + COOKIE_DOMAIN = conf.hostname; + # XXX: Impossible de mettre en commun les challenges inter-sites ? + COOKIE_PREFIX = "anubis-${conf.hostname}"; + REDIRECT_DOMAINS = conf.hostname; + SOCKET_MODE = "0660"; + # Secret partagé entre les instances + ED25519_PRIVATE_KEY_HEX_FILE = config.age.secrets.anubis-secret.path; + }; + }) cfg.instances; + }; + + services.redis = { + # Meilleure licence que Redis + package = pkgs.valkey; + servers.anubis = { + enable = cfg.useRedis; + bind = "127.0.0.1"; + port = 6379; + databases = 1; + }; + }; + }; +} diff --git a/modules/services/coturn.nix b/modules/services/coturn.nix deleted file mode 100644 index e1bc36e..0000000 --- a/modules/services/coturn.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.crans.services.coturn; - - inherit (lib) - mkEnableOption - mkOption - mkIf - types - ; -in - -{ - options.crans.services.coturn = { - enable = mkEnableOption "Coturn, un serveur TURN open-source."; - - secretFile = mkOption { - type = types.path; - default = config.age.secrets.coturn_auth_secret.path; - description = "Fichier contenant le secret de configuration du serveur."; - }; - - fqdn = mkOption { - type = types.str; - default = "crans.org"; - description = "Domaine pour lequel le serveur coturn est configuré."; - }; - - certFile = mkOption { - type = types.path; - default = "/var/lib/acme/${cfg.fqdn}/full.pem"; - description = "Fichier contenant le certificat associé au FQDN."; - }; - - keyFile = mkOption { - type = types.path; - default = "/var/lib/acme/${cfg.fqdn}/key.pem"; - description = "Fichier contenant la clef associé au FQDN."; - }; - }; - - config = mkIf cfg.enable { - services.coturn = { - enable = true; - no-cli = true; - no-tcp-relay = true; - min-port = 49000; - max-port = 50000; - use-auth-secret = true; - static-auth-secret-file = cfg.secretFile; - realm = cfg.fqdn; - cert = cfg.certFile; - pkey = cfg.keyFile; - extraConfig = '' - verbose - no-multicast-peers - denied-peer-ip=0.0.0.0-0.255.255.255 - denied-peer-ip=10.0.0.0-10.255.255.255 - denied-peer-ip=100.64.0.0-100.127.255.255 - denied-peer-ip=127.0.0.0-127.255.255.255 - denied-peer-ip=169.254.0.0-169.254.255.255 - denied-peer-ip=172.16.0.0-172.31.255.255 - denied-peer-ip=192.0.0.0-192.0.0.255 - denied-peer-ip=192.0.2.0-192.0.2.255 - denied-peer-ip=192.88.99.0-192.88.99.255 - denied-peer-ip=192.168.0.0-192.168.255.255 - denied-peer-ip=198.18.0.0-198.19.255.255 - denied-peer-ip=198.51.100.0-198.51.100.255 - denied-peer-ip=203.0.113.0-203.0.113.255 - denied-peer-ip=240.0.0.0-255.255.255.255 - denied-peer-ip=::1 - denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff - denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255 - denied-peer-ip=100::-100::ffff:ffff:ffff:ffff - denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff - denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff - ''; - }; - - networking.firewall = { - allowedTCPPorts = [ - 3478 - 5349 - ]; - allowedUDPPorts = [ - 3478 - 5349 - ]; - allowedUDPPortRanges = [ - { - from = config.services.coturn.min-port; - to = config.services.coturn.max-port; - } - ]; - }; - }; -} diff --git a/modules/services/default.nix b/modules/services/default.nix index 5c91cc2..97bfe4a 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -3,7 +3,7 @@ { imports = [ ./acme.nix - ./coturn.nix + ./anubis.nix ./nginx.nix ./restic.nix ./reverseproxy.nix diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index b5f1c87..c4e61e7 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -1,5 +1,13 @@ -{ lib, config, ... }: +{ + lib, + config, + info, + ... +}: +let + cfg = info.monitoring; +in { services.nginx = lib.mkIf config.services.nginx.enable { recommendedProxySettings = true; @@ -15,7 +23,7 @@ real_ip_header X-Real-Ip; ''; - virtualHosts.nginx-stub-status = lib.mkIf config.crans.monitoring.enable { + virtualHosts.nginx-stub-status = lib.mkIf (cfg.enable && cfg.nginx.enable) { listen = [ { addr = "[::1]"; diff --git a/modules/services/reverseproxy.nix b/modules/services/reverseproxy.nix index c7e7c7a..cc1cf9e 100644 --- a/modules/services/reverseproxy.nix +++ b/modules/services/reverseproxy.nix @@ -14,7 +14,6 @@ let ]; inherit (lib) - literalExpression mkEnableOption mkIf mkOption @@ -29,110 +28,31 @@ in enable = mkEnableOption "Configuration du reverseproxy."; virtualHosts = mkOption { - type = types.attrsOf ( - types.submodule { - options = { - serverAliases = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ - "everything" - "voyager" - ]; - description = '' - Déclaration des alias. - ''; - }; - - proxyPass = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Indique la destination à proxy. - ''; - example = "172.16.10.128:8000"; - }; - - serveLocalFiles = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Chemin vers un dossier à exposer statiquement. - ''; - example = "/var/local/adopter-un-manchot"; - }; - - globalRedirect = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Si définie, toutes les requêtes sont redirigées (via 301) sur cet hôte. - ''; - example = "perso.crans.org/club"; - }; - - anubisConfig = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Chemin du fichier de configuration - ''; - example = "/var/www/anubis.conf"; - }; - - anubisOpenGraph = mkOption { - type = types.bool; - default = true; - description = '' - Activer openGraph pour l'indexation et l'embedding - ''; - }; - - httpOnly = mkOption { - type = types.bool; - default = false; - description = '' - Interdit les connexions en https - ''; - example = "true"; - }; - - proxyWebsockets = mkOption { - type = types.bool; - default = false; - description = '' - Activer les websockets - ''; - example = "true"; - }; - }; - } - ); + type = types.attrsOf (types.submodule ../info/reverseproxyVhost.nix); default = { }; - example = literalExpression '' - { - "framadate" = { - host = "176.16.10.128:8000"; - serverAliases = [ - "everything" - "voyager" - ] - }; + example = { + "framadate" = { + host = "176.16.10.128:8000"; + aliases = [ + "everything" + "voyager" + ]; }; - ''; + }; + description = "Déclaration des machines."; }; }; - config = { + config = mkIf cfg.enable { systemd.services = lib.mapAttrs (vhostName: vhostConfig: { wantedBy = [ "multi-user.target" ]; }) cfg.virtualHosts; # On fait un certificat commun pour tous les hosts - security.acme.certs."all.crans.all" = mkIf cfg.enable { + security.acme.certs."all.crans.all" = { domain = "*.crans.${mainTld}"; dnsProvider = "rfc2136"; # Contient le serveur à contacter avec le protocole @@ -160,45 +80,18 @@ in }; }; - age.secrets.anubis-secret = mkIf cfg.enable { - file = ../../secrets/reverseproxy/anubis-secret.age; - owner = "anubis"; + # On active Anubis + crans.anubis = { + enable = true; + useRedis = true; + instances = lib.mapAttrs (vhostName: vhostConfig: { + hostname = mkHostName vhostName mainTld; + bind = "/run/anubis/anubis-${vhostName}/socket.sock"; + bots = vhostConfig.anubisConfig; + }) (lib.filterAttrs (_: c: c.anubisConfig != null) cfg.virtualHosts); }; - services = mkIf cfg.enable { - anubis = { - defaultOptions.group = "nginx"; - instances = lib.mapAttrs ( - vhostName: vhostConfig: - let - hostname = mkHostName vhostName mainTld; - in - mkIf (vhostConfig.anubisConfig != null) { - enable = true; - settings = { - BIND = "/run/anubis/anubis-${vhostName}/socket.sock"; - BIND_NETWORK = "unix"; - METRICS_BIND = "/run/anubis/anubis-${vhostName}/anubis-${vhostName}-metrics.sock"; - TARGET = "unix:///run/nginx/nginx-${vhostName}.sock"; - COOKIE_DOMAIN = hostname; - # TODO: db pour mettre en commun les token. - # Transitoirement on les sépare - COOKIE_PREFIX = "anubis-${vhostName}"; - REDIRECT_DOMAINS = hostname; - SOCKET_MODE = "0660"; - # Secret partagé entre les instances - ED25519_PRIVATE_KEY_HEX_FILE = config.age.secrets.anubis-secret.path; - # OpenGraph config - OG_PASSTHROUGH = vhostConfig.anubisOpenGraph; - OG_EXPIRY_TIME = "24h"; - OG_CACHE_CONSIDER_HOST = true; - # Policy config - POLICY_FNAME = vhostConfig.anubisConfig; - }; - } - ) cfg.virtualHosts; - }; - + services = { logrotate.settings = let # https://github.com/NixOS/nixpkgs/blob/nixos-26.05/nixos/modules/services/web-servers/nginx/default.nix @@ -239,83 +132,68 @@ in acmeRoot = null; }; - # Conf pour l’hôte en entrée - entryExtraConf = { - extraConfig = '' - set_real_ip_from 172.16.0.0/16; - set_real_ip_from fd00::/56; - real_ip_header X-Real-Ip; - ''; - } - // sslConf; - # Conf supplémentaire pour le proxy principal - vhostExtraConf = - if vhostConfig.anubisConfig != null then - # Il reçoit les requêtes d’Anubis - { - listen = [ - { addr = "unix:/run/nginx/nginx-${vhostName}.sock"; } - ]; - extraConfig = '' - set_real_ip_from unix:; - real_ip_header X-Real-IP; - ''; - } - else - # Il est en entrée - entryExtraConf; - logHostConf = '' access_log /var/log/nginx/host/${vhostName}/access.log; error_log /var/log/nginx/host/${vhostName}/error.log; ''; - # Les alias : vhostName × otherTld U serverAliases × allTld - aliases = - lib.foldr - ( - tld: acc: - acc - ++ (lib.foldr (alias: acc: acc ++ [ (mkHostName alias tld) ]) [ - (mkHostName vhostName tld) - ] vhostConfig.serverAliases) - ) - (lib.foldr (alias: acc: acc ++ [ (mkHostName alias mainTld) ]) [ ] vhostConfig.serverAliases) - otherTld; + # Les alias : vhostName × otherTld U aliases × allTld + aliases = lib.foldr ( + tld: acc: + acc + ++ (lib.foldr (alias: acc: acc ++ [ (mkHostName alias tld) ]) [ + (mkHostName vhostName tld) + ] vhostConfig.aliases) + ) (lib.foldr (alias: acc: acc ++ [ (mkHostName alias mainTld) ]) [ ] vhostConfig.aliases) otherTld; in { # Configuration du service à proxy. - "${vhostName}" = vhostExtraConf // { + "${vhostName}" = sslConf // { serverName = hostname; - locations."/" = mkIf (vhostConfig.proxyPass != null) { - proxyPass = "http://${vhostConfig.proxyPass}"; - proxyWebsockets = vhostConfig.proxyWebsockets; - }; + + # Site statiques et alias root = vhostConfig.serveLocalFiles; globalRedirect = vhostConfig.globalRedirect; - extraConfig = vhostExtraConf.extraConfig + logHostConf; - }; - - # Entrée d’Anubis - "${vhostName}-anubis" = mkIf (vhostConfig.anubisConfig != null) ( - entryExtraConf - // rec { - serverName = hostname; - locations."/" = { - proxyPass = "http://unix:/run/anubis/anubis-${vhostName}/socket.sock"; + locations = { + # Entrée site, via proxy + "/" = mkIf (vhostConfig.proxyPass != null) { + proxyPass = "http://${vhostConfig.proxyPass}"; proxyWebsockets = vhostConfig.proxyWebsockets; - }; - locations."/.within.website/x/cmd/anubis/api/honeypot/" = locations."/" // { - extraConfig = '' - add_header 'X-Robots-Tag' 'noindex,nofollow' always; + extraConfig = lib.optionalString (vhostConfig.anubisConfig != null) '' + auth_request /.within.website/x/cmd/anubis/api/check; + error_page 401 = @redirectToAnubis; ''; }; - extraConfig = entryExtraConf.extraConfig + '' - access_log /var/log/nginx/anubis/access.log; - error_log /var/log/nginx/anubis/error.log; - ''; - } - ); + # Anubis + "/.within.website/" = mkIf (vhostConfig.anubisConfig != null) { + # https://anubis.techaro.lol/docs/admin/configuration/subrequest-auth/ + proxyPass = "http://unix:/run/anubis/anubis-${vhostName}/socket.sock"; + extraConfig = '' + proxy_pass_request_body off; + proxy_set_header content-length ""; + add_header 'X-Robots-Tag' 'noindex,nofollow' always; + auth_request off; + access_log /var/log/nginx/anubis/access.log; + error_log /var/log/nginx/anubis/error.log; + ''; + }; + "@redirectToAnubis" = mkIf (vhostConfig.anubisConfig != null) { + extraConfig = '' + return 307 /.within.website/?redir=$scheme://$host$request_uri; + auth_request off; + access_log /var/log/nginx/anubis/access.log; + error_log /var/log/nginx/anubis/error.log; + ''; + }; + }; + + extraConfig = '' + set_real_ip_from 172.16.0.0/16; + set_real_ip_from fd00::/56; + real_ip_header X-Real-Ip; + '' + + logHostConf; + }; } # Les alias // lib.mergeAttrsList ( diff --git a/secrets.nix b/secrets.nix index be3f3de..9e51f20 100644 --- a/secrets.nix +++ b/secrets.nix @@ -9,10 +9,9 @@ let ; # Nounous - aeltheos_0 = "age1yubikey1qvn7t9hplvnr2w8nsfezfqudz8gq3v8sq99dkdpzmm4a74rng5qgz4v6wzt"; - aeltheos_1 = "age1yubikey1qwmt8heph3jg9sfva3yygphfw0nqed9hs8ndjsfw8yp86kwllearq9fylz2"; gabo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINzsvqxwl91qPJJX2l7g3MZwO7NHqOtMfJhXWb8S1AnV gabo@gAbolEno"; hachino = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCZ+Km78tkWXnmRTeg2F5kHgTGYS+JYM3SfAoTqvaisBRLpYHOtG889FvRjczVJn7A2q4aLGuejzjJ9V3wyF+aJjdzANPnVMUCGQXSnbHC4pMfL8fD67J+8gJil/QwGgpKpYlU0u81tgcjszYMv/ub8d9HnqLeYFkTvy2678vrsA2GoB/pO6iWOA4cubI0R0BYOP1zRnsgBM7L3swag/7lQ0L+6g+M8IcU2fr2Fp/L0gQ33e6H59fyuDaEp2GyQM66r0N+dMqjAyvB7tZlM2S28wji+DW46p4SJxNiqE8mzAjzWxV4rQDXfg+89LvzDN6iOKOtYAP9otWj14X4MOlQaKws4gicGjdUX9MiiChEjl3LET5i/zQqAMylMvm8qKTJ6PqIOootuUi6rv5d1IqLoaHXcU++h8HtYJU8o4MfGYBe4mFT4SRvJaX6C+UTdi6JKEJBmmBVwJIUCRCfXeqitc15Xb3xDgoOf0VsWiIaFnduYRDWfPKBCDl1raafxYO0= guillaume@guillaume-ThinkPad"; + lapinpancake = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWwXJiAqphXEi2BTlYXDuq88mTb1u5ScHMHwZT50iPD"; lyes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHW62pK9A6E8pEwmSnTp6oKXac+bbOJ4VkPvNLa11No8 lyessaadi@crans.org"; lzebulon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJRSBsRgd/ITK2An7q1VXoeDPbcydR3FkQjHoO+1tAAO lzebulon@archframe"; pigeonmoelleux_0 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHa+ptSTNG4mnGUEGSkHTNDzyUGeiMnaWS2nDvJwrYTp ratcornu@skryre"; @@ -21,10 +20,9 @@ let rdb = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILavl0XzmtTswvEkr12zoRBlzGqh5k5BuvJpj6v3SDe2 rdb@rdb-arch"; nounous = [ - aeltheos_0 - aeltheos_1 gabo hachino + lapinpancake lyes lzebulon pigeonmoelleux_0 @@ -38,13 +36,13 @@ let apprentix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCJV6jqQWEYuwi+OJ9r/4TbBN/cK9NvYWNiJhpFzcc7 root@apprentix"; cephiroth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOsBGkhiu6l3jeo15cQHMu3dPyL025zXPV2ZH02EDYEt root@nixos"; collabora = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFa2D9fREtO2r2oIx6q9JAKFUHtxGbgEPMjkx09DQSU8 root@collabora"; + coturn = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGoR66An5huQucZlueQCcB/vwd085wrS2mUIz39e8QLt root@nixos"; jitsi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB6jVMIZ5y2oXX9HOkw7r5UUjw95MlFaFuu7FnEC0Q8z root@jitsi"; livre = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVfKNokHG6ig32hhQxTep+fKFmKahlDClPrX/dP4/gb root@livre"; mediakiwi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFfcKtim7Aj+strHdg847D7KCCdoOAuasxx/2yi2TY1n root@mediakiwi"; neo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGfSvxqC2PJYRrxJaivVDujwlwCZ6AwH8hOSA9ktZ1V root@neo"; nextcloud = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMgSP9UmuJw8Bi2ML07WHsWvxN8akkc9XZxXyOgdjXkq root@nextcloud"; periodique = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHTdfSIL3AWIv0mjRDam6E/qsjoqwJ8QSm1Cb0xqs1s1 root@periodique"; - redite = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOwfVmR3NjZf6qkDlTSiyo39Up5nSNUVW7jYDWXrY8Xr root@redite"; reverseproxy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOx/lUQE6naP3EBy81sr93X8ktZmivU09ACx6T43Odhb root@reverseproxy"; thot = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFKNg1b8ft1L55+joXQ/7Dt2QTOdkea8opTEnq4xrhPU root@thot"; two = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpaGf8A+XWXBdNrs69RiC0qPbjPHdtkl31OjxrktmF6 root@nixos"; @@ -56,6 +54,7 @@ let all = attrsets.mapAttrsToList (_: key: key) hosts; acme = [ + hosts.coturn hosts.jitsi hosts.neo hosts.reverseproxy @@ -71,7 +70,7 @@ let genAttrs = paths: groups: - builtins.foldl' (acc: secret: acc // { "${secret}".publicKeys = groups ++ nounous; }) { } paths; + builtins.foldl' (acc: secret: acc // { "${lib.removePrefix "./" secret}".publicKeys = groups ++ nounous; }) { } paths; # Secrets @@ -98,7 +97,7 @@ in acc: secret: acc // { - "${secret}".publicKeys = [ key ] ++ nounous; + "${lib.removePrefix "./" secret}".publicKeys = [ key ] ++ nounous; } ) { } secrets ) { } (lib.filterAttrs (host: _: host != "thot" && host != "cephiroth") hosts) @@ -113,7 +112,7 @@ in acc: secret: acc // { - "${secret}".publicKeys = [ key ] ++ nounous; + "${lib.removePrefix "./" secret}".publicKeys = [ key ] ++ nounous; } ) { } secrets ) { } hosts diff --git a/secrets/acme/env.age b/secrets/acme/env.age index 847ba54..d540872 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 545de18..e0afe9b 100644 Binary files a/secrets/apprentix/root.age and b/secrets/apprentix/root.age differ diff --git a/secrets/common/coturn_auth_secret.age b/secrets/common/coturn_auth_secret.age new file mode 100644 index 0000000..0033ccc --- /dev/null +++ b/secrets/common/coturn_auth_secret.age @@ -0,0 +1,57 @@ +age-encryption.org/v1 +-> ssh-ed25519 2k5NOg bjI2RufcWjExj+R5jO694jBitoR5LoAH8HPU5jb68Ug +on2UYTnRv6ZMqKhx91QWadDhe2NJQyiLIbkpksZ0Wc4 +-> ssh-ed25519 IJtQuw wqUFsoy2iVvgYx1tWy35hY6OWjqCi5Lfvzeic/31lQY +QJi8nuKcCeAM0j/wkT7xlSCkyoIv0XCTDuhx0KFOGFE +-> ssh-ed25519 7aCZxQ bVNGLErXGPpK8P/zwc98BEWldrzU3Y6eBwbcaddmkBs +4kCEYDkuCywypMbSmyWeGSqTUbYH7Fnlop+sl5wSjVY +-> ssh-ed25519 iTd7eA olMAPNwiLpfRmiYqVg6aqmgIL4yuYhzNCjawgkHFd3E +4KGVtPi0FE5fxxuJN8JnqEcqOZG3e/fccaztnTY+JbI +-> ssh-ed25519 h5sWQA 4GewZgeXPuL063QkAKyKbUphVbjZDwRsUqyHWEFtfnA +xcDEWspPwY9/RIWXAAULuoWqGzAm8aqRqf5Dc9/91YU +-> ssh-ed25519 ZpDcxw omfbnN0CVV9HH0uGK3pQxrMG5loQC9a9VeE2vL2JUj4 +xzHD76e/DPe6ROrBMWgtyfBlLAtADDKWqL6HbCQXLII +-> ssh-ed25519 /Gpyew nLh7DhgPthyzAjvNv/q5AOpWCOYIKzW793URQYKxigc +dKGC0B18d9sCFhk0NTBKxEiYsExZ1HHV1i7FCfhYBKQ +-> ssh-ed25519 APVFfA Dt+HJjyfiLAaZOzP5jVsN6nOK5H8ktZOCtWx3RY2JlY +zOCnwK77KdzOwqvKF2wgnvby8CsmVOmR58yRP6xLBbI +-> ssh-ed25519 FtI9pg mAAKZPn4JUiwuBDyBr5obdDB78mCHM3HqFA+rTkn9mA +4saDrWVasU0boAujn51m9+cGSwjc8oDSCD+Pa/wC4TA +-> ssh-ed25519 GCcVXA aGVgJaa/xwAzofJ9S6OOrLLMsdMZww5/LiLIiGJF1xo +jH8N9anI1O9L0PUuqlA3EL5xyV4EJxBK2iHuD2rZCaM +-> ssh-ed25519 LAIH1A CAddhwvNvYiIzbmJ8M/OX2SU8TDrPNQaAtRA0nJEqDA +6Xg/46g9Kcre2w5xGtre4zgehKZ5tZ7uVo7xYy1wtsc +-> ssh-ed25519 qeMkwQ +0w0gXkqgY1LN95/21V5vFX2DFCq21LQVGPsKMRCigQ +/9b43q7p9hRa3MAeSG+ErmJY1bI4d0M+kU3r3vbWjf4 +-> ssh-ed25519 TqxOLw eFWZaTvTXNwCb5lGje8mzaVfwcYt0b/5LhauqEG/EhI +foEbCpolMPHy+wOXQ0WfosFRoyT/4SeE0zrJip7SCyE +-> ssh-ed25519 eOAUSg jVniyD6z/dwLhjxgP5OLqCTxx1ZC+G+Z3CmHtJ8oRls +/TLRR4nALJjbx+zbNik8cTuZvHxN1CPb0tBVe2/YhbY +-> ssh-rsa REaZBA +kLykFZnwLxs02yx4+VgzLWqVZlT6X9X5/dHhBfbwu1nuaG4Pp+HZTtihT3Y+THpj +GOAqaXYqykZQXncczUjY7iMrScci03MyAjBA3S8Rrj1u9GC8aFUEvedhphdI5UMg +aB1JPboSnbCUB2lCT2DPhnnE+f3pnTVzNzhU7YuDZpOg724RKKFRVkG+hp5SC3mn +v8c1d+U3kp64UrsLLLOWkCTpo6i6+BJL7SK5nivX0FewkY+CfNgeFMkY3BzIIGM0 +aGBIeOr7Ct5BbB+WHqvr/YlEtHI7CfBewT+DlwYcIbFWExeZYIrE2CeISSdOhPWp +e/aguaDZNwFofxgwAhOk/uTxY9fkRklkrw5+ecSENy73h/uOXIpVSZd2c/2Y2cYq +FYg6EBqVCFCj+GrGEjf6XIKdjQVz+j8iMIkOYreYzdr8kw5I4uLGPaJJqCRtzycU +Giihiyu9zY5xx8LAiDIz/pV7ds8uuuf93YWAGYYxVddvLrSeEOYXmkQIm/Dj/QcU + +-> ssh-ed25519 xtvivQ IZsXXaHEqEUeOtsJCMxcoqaUxThJo0rXCnClYloH0V8 +klqYx39/pDXV7haegCAccasmdmfI6UMxUt5UZCI9I6M +-> ssh-ed25519 J/iReg NjxaZVus9vMLL45pVrz4+6OIIOtg21Bo1qV8EATbLHI +IZXBltQyH511LTnlN+GzWCUIlhvMwKxHMy6qCISZPlU +-> ssh-ed25519 GNhSGw p2clVLTDu98OtEMyHQjU2fbmkQEZQg0p6tGYspK+KEs +9iJx9/nWVVepxjgMU3iU7zoX75rMVp69Gt43CsT+JTE +-> ssh-ed25519 eXMAtA M6P+lpjIN3ZQnFr9aTdzSBPLzGobGDB3COIYTn393AU +adLlUFYZNP//27rlKOLTeGKeWHB7epxUPci78o8c2SM +-> ssh-ed25519 5hXocQ 2UPQhTJRQH4X6YAn1KI2nkIQ1/19megtI8nZTjuWFig +4ECcT5r+f6HCILrirVGw+Nyn/+3TuhE3UvOjHhBUu9o +-> ssh-ed25519 bRHVVA fUJwPchqUgBEtCjlqRYXmIbY5li2rPUiPOo0i0InMk4 +yrLGXMYRx+gHwaHujzUw5RmFRD1olVUv0OgVWBYNeH4 +-> ssh-ed25519 HgW9eA mgw+0W2X+UiEVrUXKUaDoWcbGd/TPO/o2uahJfQBLGc +cY0YrQrJrJpsNOgpOxBeEJN3W/GFlFj/u3FRg5FS5TU +--- 2NNDtYZW/lL+D268NfuCe5e+1eTZlgrI0DHz+khsX6k +aeQÌ’ANSk8ÑL(YnoaŸÍ5ù<µ¶£Ú½“-H©ûY›½ÛßDZç‹ó d°úšnZÒi¯×q~ÂÌ/=3üã,õ· ¬~�0Õ‘¢µ}2çk yÕ�ó2²¶j¦�> e¿`�°ÔûO’| +«YTÖU +˜Ë¼·„£é<ù�Oï¢ÍÇ—ÿ1lªÀž:0;ˆB”ÙCY·(Ôj=`iN \ No newline at end of file diff --git a/secrets/common/root.age b/secrets/common/root.age index 2f641d7..fdafbaf 100644 Binary files a/secrets/common/root.age and b/secrets/common/root.age differ diff --git a/secrets/mediakiwi/mediawiki-admin-passwd.age b/secrets/mediakiwi/mediawiki-admin-passwd.age index 38b7605..f3564dd 100644 --- a/secrets/mediakiwi/mediawiki-admin-passwd.age +++ b/secrets/mediakiwi/mediawiki-admin-passwd.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 ZpDcxw Z/XNMwkMr7AXaMpDc/Q7ASWWwv/ID5pRpSUyx66R+2Y -8IWRR7cQVrrBFwAg0zHnbliWZWDKsa2PmdxHZsCFQLM --> piv-p256 ewCc3w AkDTktwBj1dnAA63otR9BhIAyjcPoSww4G8/cP1zSX+j -i+ftraOs9yZ51gUumFA+zJZzgAPRtVyuPfUsA0hlXnI --> piv-p256 6CL/Pw AsD6ZBVGl8HU3FQKnuskPk8qFHPgxK+9adJGuuzik88c -11sTCEgccvVjS29h2j3d7PwNZsdPqf4Y/9tagHbE2HM --> ssh-ed25519 eOAUSg wdE8dGVe35YXCdpXfko+lLsJTgJUmal7OSII3r4Somw -nXbdTQ6KrGbb/FMSiELLuQexNut8qefOIcGyocbYbiA +-> ssh-ed25519 ZpDcxw sgxtY0wG9u5Y1OeY2qrNZ4zvjSOnUNtWRoCg4AFHgns +QSon8bAolso9IOMJ6etX/lbi8SbCEHYRYwGRultcjFA +-> ssh-ed25519 eOAUSg IuHG2v0Ad8wGqFy6mdiVRrwRv5kLzBpGUAhrd+BeXCE +UMOrHTjxaLQBTQ9Jay0FarfoC6/rHcC2xxZtsMN1nCE -> ssh-rsa REaZBA -S8twRuHh+Oety2nRkiOyugu5ZgCaaoapLe4UF9CNCy0ldX87t+Y2va/WdAB2q/UU -evMdN8MOplM8UxkQy69I2BlT26M9QktFuo90ktXK35DrFwiaP8a4aKOyiKzXFdcZ -h4F7Af//lMlcwLYFARbAuXTIj5w8/Hd9IvhAbFoqtXo5+a2n6MgHdc5LvlLSjf9v -aP7+01jGcT2lSbmw8YS8+caYE3LVlUh2ThTeFQKYWm+nE78IP19/TOabmNnx8eBX -LtJggwnoNPrwmn53fn1tADI1+6QoIpTIrZOZLhAKnzDc5oasVNyjAY9NGC/U6A8e -9eaPn3KmIg6QBg8hXUCLH4JeGHFU0hIxCeLotoh1F1HEi+CY3tPuylpny08/J3AJ -i3+RvguyuJ3M5zwoMDvmavPw5mcV9tvWYhUSAWd6iZ6DIN1AHFsXQFXQuRn4P+3h -v9faikTZrt/sv4ZQgWKNoTJ6CDxcAnhDkTtlgG4afjreFvRuB7esQz8v+G6BhUcE +d3eydueTxeH6ZO66nTOPAAIPzq+YT7nYjIqRsyorJW/aoyxbkLl5c5EzlM7eMrtN +GX/0Gx4UnpO1fjfI+iZYGodt0W0ZpUV9NkkUdJM6EyzrMY+2t68a4KMky33RC5Py +0VBSS8inBEYSrK0ynXZjYhIc1fsf+B+L5nt7chdEuIfL5BAuMpgYxSi9LgAfWZbp +Vuqbw6UQdJoMXg/IO30NO2vSKDaotw0xC9zwXSYSZ7yFGIKA5eoDuy4Do6naPQPk +kVq7GfeM/3/VKAR1BA/VY76505TjsV1VvUC74piAmek+29XE+ICvlPpw58DYSpUa +h0Pq2zk7WRQ/iEvTH28XB6Y09k1GhLlcb3kHI0FrdzxDEixeNe5ozexCYh2/P96w +QKmWkm45kIWGWKO58vBQl1KMygXB27YXaxxS//SGpIhsSiu01Vx4hHdF7qX40mcp +Vos/+Xtdgw+LWIXe+l/NNYc8UojJAXPPYHO/zN8KRdudnUVcP6D7iKoWxSeyArnX --> ssh-ed25519 J/iReg aY/7+a5eakXhTJcsTR6ES7dTNBbmgh5riO0fhHzN4V8 -g4c9HRqdnw8oW3XZaDzUGl8FiVRe/Zwf/uewt8Henlk --> ssh-ed25519 GNhSGw pBleL7cbEZQhQRPP6wSLIJ9SmU7xCjdanDzQvzVBuUg -d7QKEOygw4M8ne+iFiU9DxOwBGTC9JNS/2UPx9zjLXs --> ssh-ed25519 eXMAtA PRMzXld8kf3oLoqORVVeO0THG2g6as9vTwGhznQPZBo -i+Ea7CfolHGjvoDuIeHl4bCF20718pV7WrlES+Sf2bE --> ssh-ed25519 5hXocQ 0e9eAjPAQee/VZvL2PYm9RgoVBnkOgI/y0pblLvoRW4 -PBfnrfOakv2ACKrDYs/to1zVaYldLiLldaUxn3GY/5k --> ssh-ed25519 bRHVVA gX62eG+wJesfSBd4lXzTqNMI+FjPl6fnztXygR8HDx0 -mML+owf1iLKGT9ZZkMUu2/l10eSPZEl5TwyAftOOyDA --> ssh-ed25519 HgW9eA 3Qp1NEa89r/JsT4GKnqDPaTmJaEI1on9D5n5I84DzhE -hH9Kf6l1s1R3zT69iIXmKEB0qPE/i850WMpfb2lk3hE ---- AAABc4YYLcIgv6zjThJ9BhOkR24VZ4wMV+LPR9yTtOM -¢Bá.áZñ§—3PÀ5¸ÇwÔ!™)Ñ�}Ú[UèB™ö±ÛråNØÚI^ \ No newline at end of file +-> ssh-ed25519 xtvivQ 41HseZESRIGL/rBYR7CRezKpWMh3Thi26ztTwPQoBRA +3Fbb/j1b092wuNrLq47nRyaYvkro7sNF97EIjUn1a/Y +-> ssh-ed25519 J/iReg KLwxty+boB0sFZqUjabpRv6O3iMD4nv7919itlGNUSM +YScLyKnViVHnW16z0neTDoNhudh6TQ3XCdh5ucSA+EQ +-> ssh-ed25519 GNhSGw Wm/O5VgJ4HJEAxVL1vwh7lCue2kAl6Ag6re+1/UJdig +t0MKOKWA6pzJV/ioMGYu0H28cqHNjD8Rs+AjgJZ2N+U +-> ssh-ed25519 eXMAtA YGkf8EKLxn63PHXfOjU89DTWrBACvhzdfsIJn/lzzxM +jFgsFWhzuVycKjWSlYfu/U8zkp/s20wY9SBhsmfpfF4 +-> ssh-ed25519 5hXocQ 4wHTCIa91GOjsNNPpSrZgEShRUeq/1pPAQx6ojJ0mws +pczjeb0252vhPprMch/b27IPflSUG0Y49d/8J0PTL1Y +-> ssh-ed25519 bRHVVA 9qJ3+QJRx9pjGrI5OAtb/6SRCOPYiILG5qlBe5i7YWY +8dLQYQJsXS1t+dhQyyyUSccN6sRkrfJdFFwgGeMlZBM +-> ssh-ed25519 HgW9eA QJtfC/BKZURQZ4/I/voS/JwwqLKMjDBf9Z5qkCEIb00 +bPJi3DZzmrMe8IsJA0D3pwiDBH+vuxBYxrtJEWV9Oa4 +--- KQeuQt9+I525i69EmEyw2YnhqAX+Pwdor/gVmCgim3c +!n\/•Z’kj¹=¶*ð”úÓUVþBÖ=q\‘:ÿ�0{ ²ïbëJ· \ No newline at end of file diff --git a/secrets/mediakiwi/mediawiki-db-pass.age b/secrets/mediakiwi/mediawiki-db-pass.age index 9c1c9e7..1d0eaf0 100644 --- a/secrets/mediakiwi/mediawiki-db-pass.age +++ b/secrets/mediakiwi/mediawiki-db-pass.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 ZpDcxw EYeeHlk7G0Ce8Zjz7DOA6umVE58ZNeRb1ao86/romSA -iCLH6+fsNCeM5heK2QFh9kEY44BiDOQ8um4MCNUDeuI --> piv-p256 ewCc3w A+QtLSWeA4j0756rlETtyvJRiZR3y70+UMs/X1/u0fqq -FslsT1yQ+NNHK8m/eBLWeNcsPu2BnubNO1h/AO95UxY --> piv-p256 6CL/Pw AxHghSnLJmHJz9rXlP1IQDoigFTkFUQiE7h3c0EMeLsc -bmI1TbflKxJ6Axg/TgDEtCV0pw7tY6V/pMl4CJGjvL8 --> ssh-ed25519 eOAUSg TPhT5qmh2Y9b0eBa41uTdIDdZEcDZtR6tEV8Jo1MuCk -gBD5CQlnxMYohS13RvzoDDQeGDhYOEcS18Xv1S/5f+M +-> ssh-ed25519 ZpDcxw 07gMpnD4OzN4H6ej3gSuMtrfLeMJdmgCXJBDaho6kXc +rpXOrfabWDXBa1Zm7suYSCv3jYYJttXSd4NatMmi5V4 +-> ssh-ed25519 eOAUSg Z9zWJ/NfjVIOBUrxVfKswot4NbOeQBzciGpJHc2uTxM +BbM8KLH1zJHAx+prkEqidNLVrqIsth3cdZQDuFjT30E -> ssh-rsa REaZBA -NtWXPRN/qPJ5XUZNXt64Rt3brMfbXxP2ARvXo3wpnB0ed0QPnX29OTyVm/O2VNrY -5jPouFaxWwDBuwyJ/HyJJB5SdrE188u7du/M0Z8l1/H8i2lpkp98XS64AEXkvrHo -oWFsRloCWyeIU3m1MtUdqu/c3pnqyiE1SlCnajb6MUUrhDe2CdEEgJxFsIyMwXpW -mkwtHxe9ngVebRLY3vw9OVhtqrKeKrNvSGGCE+IFn6kWuNoGD/rDI52kx76sNa0D -531FFAdsiPt1VKZi0YBaUfRP407sc6rw8R258jFCeYpa58Zud62BWsT0d464gPkD -tJQUZecCPRW0jflpVWzqZHIVurtp3Dqjp/oovmMMJ303/ywL0VdZR6PeMndGOkf+ -ame4zqTwOyQoxSkU+62D/KeSzM0QlVqAZhL+lMfYkFCYizZYQZSlLAHi7nF3704W -S+nrv+FNNxLYT6zlq0hHokP9fIfUct/eFfMmV2ff9E77Tow/79TpgQnfxxdtJWJG +ThOLVDkqUWq7TpCMJ3aTFVRdP2ux2nKTQlRUYlZ4ZGtO0xGk744FcXpsg4lPMc1+ +W2tB/vL+USNW3bluw8e3iwjsY5mcSROmt9S5MVLCul3Hgtb8G1g9yJw37HgxhlgP +P82ZcgPi/aFpYUJxiA+fi9gk3faalcjnNmtZBvianWDhn0Zl+E6EQO3FWwl7JhEw +zy8rJSk4ONxKIsJs3AnatIEt4hTYxZPpDrH7v6dcYSn2jqtiTYreDWeEMBsKMkJW +Aqc7MymG2/RdxZL1+pglwiwrxbT7Yg1wc0hG3NTlQYtJ+qPArov+AJQsfLVY0ihz +8oHe3kqNm0kQ3kPNUP8142rKFfgjHfxS0tNcD24nywwxtgKdDsZLE+KJhvTnClz/ +EI6zP0z5pb3rT0RIALNz48FUKf3TtZl1Gbz1zYayMGZHLaMJWgyfYyI/gWfWOknF +EwiZkx1eW+OpYnV4QC06LV30LybcVQ5HZQx858Q0gDB889rnb54m1jzQrBWO/8gG --> ssh-ed25519 J/iReg ZAxHEQjYmqQkMFth5Lp344f0JqwfGh4CO6DEG+uMmys -qlLlf9eLNNw3/o++6LVpy2Anj3TWkNbcJoJ/rP4JKsI --> ssh-ed25519 GNhSGw 44kEvp1o41BaNRwFnAjKB4K3otIYhN7QN9FgCd+eSQ4 -fqZM/JCIderSDDrxckv4VLZu64Dfx275UVmfKsozpKU --> ssh-ed25519 eXMAtA mPn1SPpt7RkhMBLqUZ4mWGvqNeGtUN+pcA9jjKKGPGU -bGyck1ZRHRlzk+HVmL3e99MiVFxjTuC7v/6WHjRjH8A --> ssh-ed25519 5hXocQ bT0MsqVcYEcB/ckkuAC0zbH5+pfs4iPso9MHhVUyx2U -jZQOFmGWnZMtdTS5ePKIvnQFiOVsZTC/A09ZmXzveho --> ssh-ed25519 bRHVVA NSnH4xuAWnDgUIpi+csZOvq0K6u99Dt1IUGDrzZGcgQ -L9WOetohzpDPAcF/1jGPmWnBhazSDyIU/0or+il2/ug --> ssh-ed25519 HgW9eA LdB9v8WGmExJffyQa8KuudNr97nyxshWj9j0YMDJKlI -0BCRYHWmulVjwtlYUR2Xi4rdnLSRQTLL2jn8N5rubSo ---- y4i6KM8sEq07Sx594lC7WX9hEtq9ce4Vm9tTU8loJtc -2Õ‹r};‰„Ï,"¾èívß&ê­ÀÂd¬¼}™Ž×8Uê_¼¨VY¸µÅn§h€ZúħÈgê`Nf` \ No newline at end of file +-> ssh-ed25519 xtvivQ Jmn1OOW4smkDhh9m3pD6T5ITwhgDjZA5AAblUv8GBRM ++57C15TuJr4Z1H9yJ1WNUsrySlIiCgQuuB0fiuFU0Fw +-> ssh-ed25519 J/iReg Rftvv6f9ewxhvgy37fnQfLGdyfK3hj7HSVBD2TQyyAs +4cuUiiadQdxqMhitesRNacc23ASENw+WbwpFPCVMSzQ +-> ssh-ed25519 GNhSGw PCJNjOqLLCRVASv2m5YZHAJ5h+7JwahMffn4hnPX4Uc +yloINNw9poeeWt/kMmZpU3eAysGTV0nXnTgVbXmL3Xs +-> ssh-ed25519 eXMAtA FouRO3mRd1qSmmbVKLfoTq26W5Y8PEDawNcETCos/To +oiUxbJCv0Kp8fhZLFCaHjpnP6a1jwH82484tUVlnAHQ +-> ssh-ed25519 5hXocQ WYbtfWBJ/X6UsoXkgvZPgHuyy+42LCkfqf+8Cu+DUTE +hyQLSsRqQWhG7zvRk8Ku0Y95G05pk3sa4vcA3hznHdE +-> ssh-ed25519 bRHVVA GhKRyqw5wbcOrMz5ZC/xKSuw7j21T3JRk2QvNAqyhyo +VvYWB2dYm6CHW3f+jJ4WTrx69yYOHLOtQ8zcJ4Y41x8 +-> ssh-ed25519 HgW9eA OYaf08DrJfHcC5MOy9Cyo3COABEW+OknqCSOMDmilF0 +vJMn7kxuV+3beUHmGtQNl0VZgEDiYztMyZSRwF23LIw +--- jK+rDJzsE98oYIq15m1Pekx+cg7ZF5bnMpHg43scDOc +á_QáîÊ0yæ®–¿,ù¶Ä¹»mhFïXsר�ë¬:÷©8¥ég a(¢ûñ.•ó¡„F]¡Þ®3ìム\ No newline at end of file diff --git a/secrets/mediakiwi/mediawiki-ldap.age b/secrets/mediakiwi/mediawiki-ldap.age index 11c2eef..83214d7 100644 Binary files a/secrets/mediakiwi/mediawiki-ldap.age and b/secrets/mediakiwi/mediawiki-ldap.age differ diff --git a/secrets/mediakiwi/mediawiki-oauth.age b/secrets/mediakiwi/mediawiki-oauth.age index cbb010a..640887b 100644 Binary files a/secrets/mediakiwi/mediawiki-oauth.age and b/secrets/mediakiwi/mediawiki-oauth.age differ diff --git a/secrets/neo/appservice_irc_db_env.age b/secrets/neo/appservice_irc_db_env.age index 0276385..135c870 100644 Binary files a/secrets/neo/appservice_irc_db_env.age and b/secrets/neo/appservice_irc_db_env.age differ diff --git a/secrets/neo/coturn_auth_secret.age b/secrets/neo/coturn_auth_secret.age deleted file mode 100644 index 5f6209e..0000000 --- a/secrets/neo/coturn_auth_secret.age +++ /dev/null @@ -1,33 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 /Gpyew gwwmM3XDedFdxIFd92REcgLv0CIb83f2wo81BTcmuVs -7CLQlsrbdcC2I+TFop1iSB6YjH6E5MGrDbxPnePe3JU --> piv-p256 ewCc3w AgITAOii4K9+Xbq5ycDiVQycSmfdcQVASFlaKfTVpyYR -UOThjo/BQF2tU2JMe+5rgNySiwfcZeCy0UHYxJICXDM --> piv-p256 6CL/Pw A5bw0Y8IFThwuoI7/8eOEkJEc1tLoGpMgHqKEvZq9kKH -+LHipQ7p+tUkMmxfy5eDRuRP3+H3Iv5QCV4asfb2mdA --> ssh-ed25519 eOAUSg qk+sku6sjw2oIMwu/1nH+gUaHAoGD6/GnjlrXz07JQQ -hC/LQEyaESI0UhJ5nW0vYHSUZuLhUCPpfUcCFM044Cc --> ssh-rsa REaZBA -EFF327bjCoY1QnXjquMc53I1PEO7br6yY31wm54Tutqzl4oKRoVg7ztxOc1qleXX -EHBOpf+/30o9SITi9U7B4L68WgsJh+B08+Wrok27BHpjzcHHZiT8VZJjQGhpFaN9 -TMehN/eH/C2A0PnBzdd7cHdlCJ3cXEMoZF/aTqMNe4+Jiyn122voxpV9Rt7eM72K -Y0Mfsvwt+vJx+T+9dqcF187kQ8hc/83h0kxbqO7O/mrLfQpFLpF7wD52TAAX8vlX -1DZukblDSSltRRt/2XI4SwtR8ioneJ3LKWq8PUNwvJ6rfjMo8KqwWsZqO7ar8YW3 -/H6ACGUphXZpWc3JuN3wZEodO+gwcYnx6AUgXuZ2DKLanmpmflTg43mRE8BZzDO5 -HWo/LOoErHRBPkiqXYDxyXP+Y3zhp7O7JTzIyA3dt4bjb3ksAKd7Hw4vy1Kqch2j -XE4d5v0uDTMBV6PwJ58JcmqKkmWHLslA0+6GMIwvKqpFWorDa2WGhtKsWeV2eWqZ - --> ssh-ed25519 J/iReg FMq71dEMAtay7dBPc9qaZsw9qvXwE6EQznZn6xfRGHc -910ePcO921m+dJA3MdOmkRYolUntUqpoksRm9CeEEpU --> ssh-ed25519 GNhSGw uIQ0FkYLMke1pRAJx2YnUEj7Bzy11JYDMtpw590Hj2o -62iHQoKl/ysrWgpkmJLs/PUSsuRFNKd/QqvyoQ9tnU0 --> ssh-ed25519 eXMAtA WCsV2/+iJq9PxXlgYKZG4cE7i5MzFB6Xs89JfCCPMzI -zErA0D90CU3L7NRXTTmI9YzHSIdOiaBf2EGONw/XBOk --> ssh-ed25519 5hXocQ zmmtRrPesAFQYYZ6JpefonCBB2dNlCYxlS769OLoe3w -/b7+nMn62LHvSyJ2u6nw6yh87aK4EPVK5uXGNpok/c4 --> ssh-ed25519 bRHVVA hUUrPRVry1Ff1nZEztndLSEyUrTOhlfbrJCUvatnRyQ -Y0TAB1jpR03VbdrAnDnWSeNTJX+srMfqaRCp106bgss --> ssh-ed25519 HgW9eA 5wiFunotVB/3vLxxiFPlNNYxdeffD2Efgi8dikTKl1o -e1MvuQOP+1g832x9Kk9mJaFiPLYH4ngJlUh+rBZav7M ---- CemGwNRUonRtuSx6BTHw2M9JHOuY4mZKoEqfGJgyjxE -¢Ç-kžÃ|59CzàÁK‘¿û/S^h:¸ÉÖ”€Dú�H˜»¤Ab‡Z?Om-[¿¶JæbìïB°XVu�_Æ`‘FN²�œÚ‹ÀtRD"O­}ª�ß �QøQú5�ìÝuaV>ZJ!‚;±ïÜØóOÀ&+b;¼˜y¹þb\îª-¥Ý5U \ No newline at end of file diff --git a/secrets/neo/database_extra_config.age b/secrets/neo/database_extra_config.age index 09e54ff..799efe8 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 4aa5546..f4c5d98 100644 --- a/secrets/neo/ldap_synapse_password.age +++ b/secrets/neo/ldap_synapse_password.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 /Gpyew WTvClaBByXLVpVR6ekYwJpTWhw4aD6bRNDEp3DVu42o -IyYxHrk6+KqUv3qwsBx41uytPSOIs4LaL6mxSxATCvM --> piv-p256 ewCc3w A6bdKPlL3uBjAJSiNFTeQqCvtnz59ttl0NfroCrnZAhA -tAwEPuXLigJmX/wplhPUHbeQZ255gwnPJDWhWo4qVmM --> piv-p256 6CL/Pw A5drVBtV09oKblh9aeFfmhVy/UJex6bVypvPnRj3L6DA -xoKl9RB9PVet88UoH/vRBI/tdSOoI2NVlnTk1eNdnV8 --> ssh-ed25519 eOAUSg zhUS9oNXmH34fb52bdGlfkAdQMFq7+tiOlSSqRJXLzY -1ISRA6o5mk9RTGtjlQjBJ8p02Ey6CJycZrjHfCoj5gE +-> ssh-ed25519 /Gpyew IBrZ5w6v9v2oAW6bcN6eExeP16AnAMBkMSSX8oorl3U +GmuKlSgAgMPT91FmIbaadmDxnxWwY37SlU0EWXSK7zM +-> ssh-ed25519 eOAUSg Yb9Qy0t8+e5C0GMUnmY0SbbzTMIPVIhFmo/gpcVJc0k +MDF7DD1JjZ8jlTsHxKB3AdBFTJwX6lA0V++Da623Voo -> ssh-rsa REaZBA -fjMa8z12MNcJu1pjIdnHxvqDGPOF0Y3+Uj2AgsnKkwPLchtmMhJb487j0zYjwogu -EseKAuLt+2N+kDYco9O5nMeTtiqd3iOczazrUZ5dubxy1Y6r/VHa1MexGoTJj0ma -qCJ6KcsbVndZGHMf6ASJSa0wqdnd61zvCIU9Tc7el6Q3d+86it73Z93eJfztiNFm -KopgrKQLsZJiLCtd2Iw3SQB4R57qiDZxPRHc/xwE2rZRd7wZ3sTWCrTN1VeKD38H -sNioXesU9N/XbckA54oY1+8h1Ihihrce9BzmvZVYHLYvOTHfE/EqU0B5hjt5Izgt -ef3ObzMSP3isu4ohu+l0NJksIDIJhpIcvkQg+bN+6iADcP0MljX2805naVlXAf3M -jJ2lLLxUOSG8ly/55hVt660DBTxQ4h6MolSBWI/lhjYwXGNAob1Evz39kIgm9X/1 -wXR/ZUE+1Q0fxfYef2v/uQ0IKEaKPi8yH239zaY4RONKrpfJjNLPfELdJjE0wUl/ +EeBKAR7b/fP+09y35RBEF+7ZV++Swml7VlRct7VRje12FgVFi4BSvBFoDdJOs5gK +VDwi8Z9NzNQdp1OCJsQzjKz51XcQpZF1wign3Z87et9EcKEn4Qm+lCsabJylwmMC +UoZji+YGDrVy/ZLDlTcjaLj1fE//lwdw2TuhdAFQF+9lOI4aLvSGGIVQu4d2AdAg +toInWUSmFuuwtjHkU0m/FEYr9Qs8G/1A/nXkZunZNFrWxx3CKuOzK44e53OfnolY +ZNofHUAVundQuP+Qa/0hfPMjXzRb+BQUt08HTtN25eBh4/rVJ0E5vkdkF684UTus +kL7oD4gM/KGoMVPCgylL2YTU9ZpeM8k4LsRqMlUrcL7LhrioSzbdkBZU1ZK6IXCf +e5maoZBXDYTZ2YOngV61x+2etJOmqUjM5MQ3JytoIyucdkodhgEnvvkJpdhxnHHK +1dNOW2CKG79bzS/b6ye2MWXaQbVmGLxqpf8htGn6ZQWNRbMPWXh8BNzpaKFjUyLx --> ssh-ed25519 J/iReg COlfFebSf/s7lKjBq9h4kgAy6zMf+hrRN5zQkf2rGFM -025SIjIoNJkTReTcYvyxXWySl6OrNVBvDLI5HsVyJgw --> ssh-ed25519 GNhSGw hT5oqgHVHMkCz8pHc2XxI7yyt3uFaRu8F6f3xoW6VAI -w/A1CiFkYcLl1GiVBG7qjJAmQ/Rd3AvdiGc1nxDgyNA --> ssh-ed25519 eXMAtA UbBEC8MaZY3SJMQHA1VdZmhY722X1ExyNZuME8oCEwI -IZ3waDkdXgY9bLaSHknVM+LJh+x+397cgRp6OV0Ve9g --> ssh-ed25519 5hXocQ yPxYsrn/FaHWrgCaZEYXmqmGMFFkM93rI9RO0ptcy3k -CAJg72QQOh6g2XRYAwrkuIajY/tUY4wxdUNXjoTDOF8 --> ssh-ed25519 bRHVVA Hr6g7m6P3/OO/JJ6iJhfq/qf/b21hmx5heYLabH5vE0 -RvPOA2StY5obXZ8AqjIt8wyuuGwzq6w3dJj32bP7D6o --> ssh-ed25519 HgW9eA RdxjcI+oSZ6MBkJUOtRuxyFiUvrw616WkdvKQAbOwio -Pak2LAJMngMh5BHilHKkot8x01Xae2nk60B2b4CobUk ---- U42DR5LGkGyFrLN4AwWHWc0HANT2GVmlBFQBf0xPdNI -T¾yç ž:'Ó£N`hG§N ’�®Ô²ËB¦±±…ZXŠ÷€ÚS>Fd­m³8vº¹+ÆUplÅw \ No newline at end of file +-> ssh-ed25519 xtvivQ SU5wh9/GykYU2kHQ5GIEFnPH7EjAg8CmEKp82t2K+AI +01Tb6/znZhykBrxwdFexCyP1qikgDiI7af96rBhW464 +-> ssh-ed25519 J/iReg Emu352v2E1Co71gc7RXMXNY6AklpZfcB79IPrKQhDAU +kinQlxAqptqZ38i+oedyJHBv/3SCOsl9Eb4ueFrxGe8 +-> ssh-ed25519 GNhSGw FOLIcgZib0qw7bcJO4Q7KGUuEZ/qCBPhGgr0TPEWB1c +POaD2+F/zWRHRE2Z14jhPScmCuq9rtSANvUniJbFZhc +-> ssh-ed25519 eXMAtA z7jG0PfC4AFI3JTbdsOL80hR13BrnlWyG7pFw+sNqBU +DJmWKDo4iG6x+4HTmRzO0w7fv+YSFspZtgswrmplqJQ +-> ssh-ed25519 5hXocQ dJweOoObiDicoqJK0AOqt0AROFcdyczcWqpAW3wvDls +OEjoGxbvTP3V8PUWuUlEjXIh7vNq5efXLc3pHIAaknw +-> ssh-ed25519 bRHVVA DXy8bLnXK8t3glBNnRIaRSv52wYIq92IvR9gTrTGCkM +qfUIPWbAv9iex/25LSbT8DSoCUB2pj8SAXi7miFQS4k +-> ssh-ed25519 HgW9eA pFXVIpKIMr/Zh8nvyiRaQgsYvs6+vkR2H8g4yk56/Vg +QQzRYB3kYSarbI529KRj7C1vd0rCIXFtEQrexskSK34 +--- TBMmK4OruY4Mq1hSu4hkD7f3Esc1dhRxze05zUYJYME +”|®©>z6op›:=²_Á˜KÄgÚMlçÌ*mK‡ð´ù3µÿfOU"‚Š£îM…&XçÖY’ñj \ No newline at end of file diff --git a/secrets/neo/note_oidc_extra_config.age b/secrets/neo/note_oidc_extra_config.age index 2887697..80abd8e 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/nextcloud/nextcloud_admin_pass.age b/secrets/nextcloud/nextcloud_admin_pass.age index bf1c90e..74c4e1e 100644 Binary files a/secrets/nextcloud/nextcloud_admin_pass.age and b/secrets/nextcloud/nextcloud_admin_pass.age differ diff --git a/secrets/nextcloud/nextcloud_db_pass.age b/secrets/nextcloud/nextcloud_db_pass.age index 546957c..875fefd 100644 Binary files a/secrets/nextcloud/nextcloud_db_pass.age and b/secrets/nextcloud/nextcloud_db_pass.age differ diff --git a/secrets/nextcloud/nextcloud_ldap_pass.age b/secrets/nextcloud/nextcloud_ldap_pass.age index 57f58dc..f330bc2 100644 --- a/secrets/nextcloud/nextcloud_ldap_pass.age +++ b/secrets/nextcloud/nextcloud_ldap_pass.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 APVFfA Z+0daNofon4xgikMa0TUQjUgp9jPPrQkOZJuEJDUmzM -l/QeEQvggQtfgyrDcs9lRpvuFMEgn9i/wQFpuaVoAZ0 --> piv-p256 ewCc3w AzbC2uqqhtetX1z1XlyVxexejzk8tvPNi/3rcGgOyMSZ -cpl1dYYvqgkXbpvy0JcVabP7Ftb7cGY+IahV/yyDbhs --> piv-p256 6CL/Pw AixE5HedgCUVyin52g5YHUQFKaSr7hlF9LfsmbQPMf1l -loUpO6pz/Qv+F0mSefpCP3IeDeJ/pq5hYlzacdAtlo4 --> ssh-ed25519 eOAUSg b49cZWhT7+NLJlrH9EyWu6GPLkST9/T5BGU1azdQoBI -dhzYN+L3k8CZRMbVgff1ofqlImyuD19PUGhhsxTHaMY +-> ssh-ed25519 APVFfA 2lPsdbADR0jatnTre0SiuacnTzPDGscN1HF+bOjoGnY +iOeDe8I6oAdKN798coEYnLKyegY1JbV1ZxC7JoyZBhI +-> ssh-ed25519 eOAUSg bWexvEajEuqWteAKyx5Ctda7K2hT1PQcj6U6fFUlYSM +Of/NyjVhbLACOlFp9yCZxv5ZQOr7tBNs484ruivIE1A -> ssh-rsa REaZBA -CWiPTj/40DTjN2GWUsR92frMYiBP7tfSVADQ/+GCapOMNJD91MGxaiK0IocbJr0P -KpOjfdjRDG8KIYszNgaS8XkHn/CUj2KsnRV2WBg3HWSrMdD4quoOxKWbFaU3b38C -4mUK8gIkjbJFWFMSTOhAexHGYSRLl7fG/0VmRvc2ibs5CahbPsMbFDKuto7ApYhY -e/t5SsYgIkbrNpeTLolO943YCIlU/JVP5XOuEDk1ZlKPRc+igpgqFjsD3LsV56Rr -LFrjp4i5wJeA72HeH/S7nP96sAwxyLDHQrWhw3ntM0n2SRRVCVmLqNNOebUL59gy -HRHHoZosepmHzMEOHQ+CrIxuYMiUQ/AyMkZmMTjxQsLniakJWI06G54f1+aaA0F9 -BhwFateWkLBNdkSdwqJpBAzh427yetzp/bac8dcTv45ylgsvCVSDpoew5NLoIuh5 -I/54NC6Pr5BF0LOW7b2fR9pzk7Rv6hnSxTbeyATeMhh7nTjdcFalUI3Bd1P3RL+i +mONZl20vj856uqzQ7ByNoKCZcWbPlFpDWhroD6dwI419zCJ3jezsqkqVUkCa7Ea7 +FUQ859Rs1zZCrBSJJ4ZpxxMyCvrLWZMvRXHwBUmyIfnyOJT690Kf7odFTpZZtFDX +tfUvZd8uFkevYh1kq/KxZwFHxQqfVFOuQZQwZRdFje+btfES5JiJUc+5EpjNPHCu +lDZjzY8nBbWa2XkwXr1UKzV5q/DhFP4D71LILe78qHssKU1y1VzrAcfYAuLyMvfB +lIFrtZt3qRCx22cI4VUkuodMAkQGjRcFpQPCwdhLBqjtmnnag3NMeRPoNuFDRk2V +K8zJ2nvk9cacZmZHBXbVpNfafrtaJ44eCfvNzJWbqSt+Z7+Mgm66ZVB+W7s5cNWf +MkxCecJBWl4EakywYGklSv8wjY8/1QTrMIPio783VTC5IToahBbPwx/n18KCtLBL +aolfxjFPo7l7dRkNdGezxx/Uc1ojdGmL2eWZsYX4WgtH9uSpCIw6hKhNu9ctX0LV --> ssh-ed25519 J/iReg wbkKYkdu/cxnZNEGXH0a5R5jV6cQlMpWFMdQiUpWTiQ -cW3rZQMYrzhx93lsxoPhA8AVQLygKytSue3eEF/yxcc --> ssh-ed25519 GNhSGw Hd4AOis8kPKDKrOgRZNj9pG0bHFHgLfJwo6sd1/dSFg -07UA5cZbEpf3pA7i04CDX6m9FZF5ahAorfp5GzXJSS4 --> ssh-ed25519 eXMAtA hZ278rlg0u1Bp8rkEQGFagLYg3lkXK3uSolnUbIy0Bo -k2sPaUhiCCaBUogPxrUk3Fm386DKuR7UBrGMAteykps --> ssh-ed25519 5hXocQ sYQmrGm4eQlgE4Lkn+ZFE4uI6czxM46SMpQHFRedtQU -cIFA9Vk091Q5hFUUrjf6PRr/WS7XN1BfgpSOZN1m0xI --> ssh-ed25519 bRHVVA 2n976nXhvJzoFjP+JFe6L1rmCEmTr4YwhTR1rqyA1y4 -/X27rYKrHUB0Jltxc190yPXCiHlOXX3QEXM52BnON60 --> ssh-ed25519 HgW9eA nNf/0O1vh6+uv5i1+HEy6MgF3VUImMru8BFCcJY7R1s -fPSK5LcFR6WP25nFvJRs9RatiJ4t/LvIFYqdoOYxu/k ---- QKKNQqbCPvtps4QlI3ric0JdAcdJ9g3QkTPj+RUGAis -[xqZ†ÿ¥ªSD’ˆcO ÌfkŠÖý ”N¹±›;�H]IòÉ£ÖùÎA‘€A \ No newline at end of file +-> ssh-ed25519 xtvivQ AXRrZ8u8ArZTZ8rx2lF0WxHXU3y6vcNXKjSjWBmN+TM +vnzVaZ4+yt9FaaK//velajr/SVaZbxhXf7pysh1da5Y +-> ssh-ed25519 J/iReg iVkkpBKXEnts8Rzuv3T0tSGR8Kz8dn8GF6W1LNsJ2Hg +6vj3og6Nbv0WpXSZvojGagQrMmkGrb+pqOgNOj/kn1Y +-> ssh-ed25519 GNhSGw UCoWuPCDsYFhZfPCXSLhoROsh05UJWT6BGwkv5rS/zk +DlYqu4NJlha+L67e4lwucm9n79mdVXtce4RLCh+uv2I +-> ssh-ed25519 eXMAtA stcG5YF1qJD5+hrRScLbmKcvC9zOGVxKVgnp8NwGECA +x2ymeDcA5MATQWS57Un0T4jELukdo9Bx2RBfFpoatXw +-> ssh-ed25519 5hXocQ 952+fj28Ti5e/fQfLlhptwcrGEI4+6I4byhBQhbwg34 +iYmSma6ZFDhAWJUdvbIhBQKxaAlljOXJRxqV6YZNZUA +-> ssh-ed25519 bRHVVA VtudOgiYcmYvNsY97/S4Ruc0dGAT6dvN0pukPthvu1Q +Vt23acfbd6bteFq+0H6yEaJhSiSNG4F7Y2g1VN9nK9I +-> ssh-ed25519 HgW9eA nOMn4QTUqbRhkEaz+4DTdYrdWpoMtPuSdu6JXgygIGY +XwPY62WDiZlDR4vRDcPE+eb2p9MzWvR5BcUjV0ryQfU +--- zJiRXtxaxmqruvAsYoH3VP542qgw44nZtzEMfxNUox4 +¡+mC*¿ÉiEÝ$# +s1U¢C�¨Îü”)|álœkd¥5õ÷ËRNR0 \ No newline at end of file diff --git a/secrets/redite/.gitkeep b/secrets/redite/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/secrets/restic/apprentix/base-password.age b/secrets/restic/apprentix/base-password.age index 79aa0b6..c1a6e2c 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 bc88463..af7c17b 100644 --- a/secrets/restic/apprentix/base-repo.age +++ b/secrets/restic/apprentix/base-repo.age @@ -1,34 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 cZNEGg 4yE5rMf0T/Ck44tKN0QyRiZXq3dCcowZ0guI1QKIfk4 -jpLH9R+yHea5gTz9X/XqfZqdl4UsQSqFbx8ooy6ufuo --> piv-p256 ewCc3w A7tSNH01szuaE5kyyuTEfeefMyR/VfvbNEw2A2QSgiAv -uiP96aSJKFCO/6rGOZSrfUSuqzc7+JditcbGKlKy8mg --> piv-p256 6CL/Pw AuWkuPTVIhOEi2x7cjTpz4KYMdGn9oTx42VEp5hssYVP -C7g5ajOKpUK4XrtUw5/j6qEMCo9SXRBV6oaxabgBAqk --> ssh-ed25519 eOAUSg 7ODoSYHXtdMNbMEoGAeqIh+XZv4zp/TbSamGEGbMl1c -wsFlrjgc2AGa00KtErp/tZ7n8cFBQyAGFfth/o/tGrM +-> ssh-ed25519 cZNEGg uShiVeWwWgGqvOtlRRGl4L2h4Ky/MW+mA3dIHl7SQz0 +JcN+jjIgcyD6Q0LQI2KmKMKijv0dL/xMDV0jH0PrYDg +-> ssh-ed25519 eOAUSg AsvPdQgamdxqTrMZ4V54udpNN0YOcyNTHSiF9EXzQGQ +oDHprb5DyUiaVfA7f4iQ/IAwOemuEXd2OHVyjfRX+hs -> ssh-rsa REaZBA -Dgkjbrh7XCRvzCsCWVT09PdLXtjF1I/cWSAZWvDZdvc0LweAgzRmutXLv6YncF09 -vQ5dACCX83RSSxPkxqeLPY/ym//U9yWwa+UPUqTUxcPagDMnS/RH0ExmcbTg7PoH -ArOK9vfVhTR/uZUJM8dEDh0C/b8J6UKibwDojybn/nuoqZGePPEvTagFud9x7WiM -/FGi8ByJVx07ztvGYF5Xiy86pJQ+5xwK1y+1rtjQO26eFl6szMBn8jL3lhT7IpUi -5jJ/ckF9or+NKIPQE04MRkEo4TKG9emjMsjw0NWaEkK8l4RxVaJrNvpsUsKLec2w -BHOvA2USNOAuulrOlHJG5vBGBwy2CCxUvxPNb8lB3zIOP1jkLP6dDWd6lVVwS+6D -tkcSefbKX+PbUiWX/x4SjhhT9YKYZqU8w76pProl6jeEAnJz/B12NQMcRumfYP6Y -pSMIIxnQ2yUBmTxY3eT4JYkBUiY83uy19WfcuXDbBTfBpP1hnZvU9VQP6hjcZZBg +DUYE1eT8gM3WR9qETw2hAJJIQSKUy+A7OuKPf9XsIh0sYKXaWZNFOA2BHt9S47zO +4vWqKm72ZjmCmeSuoE1Ap/d2bA0Fc8nfE2ZJpGLkUyq/F2o87WYADabqL8Zpdkzg +wZgvrwojnFSpVD2p+IpkfmRJAusznXxA2Tie34MF+m7NOekfhYrQIT9NdZFLv2dE +YtzK3czhwvDAAVfdyp1hT+VUabP5CvVFLpMcf/egnHWxVhLfAMEADNJihGPVtJPq +KzuHCFnIUHreq7/qK1DueGuRWMtTFl8lU8VygG95ukNe9+vCnOoC4fqwGYdTgH1w +HMHaBo7oiWZOpgqQwkeesqpXMEqg/QkW3JCtv/6598SMq/jEibUHsG2/LwjwN5Be +MEI/0g2k0PgoNedQLZaNuu5WLfDz4JDFtoHb4ev8QQVBrqPBQzpQLhosJP7mHXHl +H8L9G5zOaNOG6EZv7Nx0jlce1FPkE/j3Ov7jXB8rt3Q/NjN6J8uTwOqmzjVjAyhr --> ssh-ed25519 J/iReg Mm+wU5LNrV43Wi2Oe8KgozDM0qWeLMAN8gNXQ7amuyg -gOhY5U/knFOydERodNiOjRvLz2Z5qWUeLA0/OwlWzvY --> ssh-ed25519 GNhSGw NeBJ6v8rh9OOL5SqflokO9rZpmmiDTivU2VXtxipTDc -yBAmTmNEyzI57M2UZaCWfm/fj8khwzA2FoSx4eD18P0 --> ssh-ed25519 eXMAtA Hs9CS6/PKfigvyxjPVtEMI81T609jf467b9FXFRwYHI -o8QMsLhzd2oQl7mx6ApBGGwBoHlIGi5KUf/+1uYT0l0 --> ssh-ed25519 5hXocQ wzHYIxMAUJ41T8VjTbVS76Numat3lEEUhlOG/ayjwGg -iP3oNKsen75CQgvsUxRSIwRyTi8ciFM/az5bV4igZVg --> ssh-ed25519 bRHVVA +rQA0WXqntTB3HLcgIBfQICOCsr3arwLkalFqyuOKmY -EcLV9p94uyVowuCUbtgFSUU02Hq0FgqRwcxFzQI84n4 --> ssh-ed25519 HgW9eA nO/v7qGEDpYGritz4PfipnENjGkMyVkOmh7bsH6Vrio -j/uyrtdBhlCkyNwzuc/74oraD9lzKUntUpwvgas8Ccw ---- 8IwFQRcJgpWpwCWc+zyeUir2onPBrxi6sMtayU0bAGg -Ÿõ«ýIÊü›>ímhƽ·A|6ˆN |jyts-ô¦ú*¨o©QÂL´s˜�‚q•Å49X¥,ÍWbžˆùø´žíØHT^¶N\~W�Ó’bÕýØVìîz`r_ -ß¶ÌËüºE�jîFïµ,rà§ñˆM#³ÿ@ûg¼ERìÍ®ód¾X|H Û \ No newline at end of file +-> ssh-ed25519 xtvivQ IRTrsUmfKRE2qvnRHB+lq/SvtyXCnWVpHwQCCtB62nQ +UGjcO+N2OK0X/ThNqHjzWhM5HRZSPR398pr7t2aboek +-> ssh-ed25519 J/iReg /rxfx8UzIwCVsanrS5F1y1Biy9cOnbNlG9Aq6lQF8X4 +msbGd7rMpcvSUcgHcuaAGk8LQf2kFEKUjoDWww402jE +-> ssh-ed25519 GNhSGw TEE8HFiNFffV/qGjedfgNWntr09XGX0UIqArfnsBABs +NVk7CxMAKXQBePP9WKEEdP2VUt70MDFB2bW/LBwhHeY +-> ssh-ed25519 eXMAtA a6qMtYBpBJj/JhagMdITCH4t692ZQYgoXFeV1w/GGWw +3N0K9A+H5Ys5o/WrDBYmn1u8knyuGGJs5mkq8wO/2BQ +-> ssh-ed25519 5hXocQ pNBfFJV315eLAF0raV958VZTKLeFzSe+N2bSW8h9QnI +pbPUy5ws1W2gU6AloqxPYtMla1RkHyXwx0iXHFyRi5g +-> ssh-ed25519 bRHVVA g1JbtYLpzJqQ8AI9W1RupFvVn61IXT9/0O8VfGv0kjQ +54gc6pu3k7WhbPaA+TbeiWlKoiXMl4HafUwgZLw8OZk +-> ssh-ed25519 HgW9eA KdOUtRsB8BCFmibxhZ//YkQay+enJblwCYZbcxQAox8 +kbPjeIki8ewmOspsbWUQ8nMy3vOrlaqEGMcodIlUy0E +--- s9hdlTKOxG6C0vBYJwEb12RlafbYqaOk3ySA34gitLc +Gô¥U/Ç ãÙäO»Á_õÅ Ú=ÕEöæ#4 úGŒ`©vm/µW×à¸IÚ›š«½LE'ÿPuAE+oo.�­‡˜>—Ѥ 'ÚÐ_R{Ë#Ô 6ab „ÊîMó±äqc” ì °bF3ÂÙ&=¬&Ðag0�å±TJŠêý¯†F£F”LÓ]K \ No newline at end of file diff --git a/secrets/restic/client_env.age b/secrets/restic/client_env.age index 52c5bc8..838fab9 100644 Binary files a/secrets/restic/client_env.age and b/secrets/restic/client_env.age differ diff --git a/secrets/restic/coturn/base-password.age b/secrets/restic/coturn/base-password.age new file mode 100644 index 0000000..71c6782 Binary files /dev/null and b/secrets/restic/coturn/base-password.age differ diff --git a/secrets/restic/coturn/base-repo.age b/secrets/restic/coturn/base-repo.age new file mode 100644 index 0000000..cb5153f Binary files /dev/null and b/secrets/restic/coturn/base-repo.age differ diff --git a/secrets/restic/jitsi/base-password.age b/secrets/restic/jitsi/base-password.age index 6387385..f7ef8b7 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 62efb1a..53fe200 100644 Binary files a/secrets/restic/jitsi/base-repo.age and b/secrets/restic/jitsi/base-repo.age differ diff --git a/secrets/restic/livre/base-password.age b/secrets/restic/livre/base-password.age index b1b3125..3efcac2 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 906b93a..08ba348 100644 Binary files a/secrets/restic/livre/base-repo.age and b/secrets/restic/livre/base-repo.age differ diff --git a/secrets/restic/mediakiwi/base-password.age b/secrets/restic/mediakiwi/base-password.age index 03a24cf..034ccff 100644 Binary files a/secrets/restic/mediakiwi/base-password.age and b/secrets/restic/mediakiwi/base-password.age differ diff --git a/secrets/restic/mediakiwi/base-repo.age b/secrets/restic/mediakiwi/base-repo.age index 14470fb..da6806f 100644 Binary files a/secrets/restic/mediakiwi/base-repo.age and b/secrets/restic/mediakiwi/base-repo.age differ diff --git a/secrets/restic/neo/base-password.age b/secrets/restic/neo/base-password.age index 5cb5585..c6ffdfb 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 34fab68..909f279 100644 --- a/secrets/restic/neo/base-repo.age +++ b/secrets/restic/neo/base-repo.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 /Gpyew vIFRLoY0pSHXGdjHZspYH7Da8EJVLZSPjqN1dlWAJX8 -g6wtbFQEem5VCNf0ALqeNAJ1sAuLVRvzroinIuDM1ng --> piv-p256 ewCc3w A1d9UW/wacw1HF+8r7rVl7xUGCL8/ccZLiKMhLXhlOgX -zJ6m8ftB12jAptJbHxgg60yMjI2vVymNVrhVuRBZ14A --> piv-p256 6CL/Pw AqIAnuiylRPEpjJ2+ht0UX0LdDow4j4PXWzslDQdq6pr -2z7UYNiU/Kzb5GyoOWTU3Xpyv0G1yTmz4TBij2R8Q1g --> ssh-ed25519 eOAUSg zaw1C5OKDmIMDatfxMFhuqzEiQniV1gr7KpC2EY3i0A -SuyMbAxoA77fLLIzpJvWIUAy2K/E0a9zxFxqjtS4ZGo +-> ssh-ed25519 /Gpyew torktMqTH8cNWHlo9I3Mj9YuqYtv+dl9puSlUIHezG0 +rco8SOz157za5fNTarTDWmVqsVhSA/4H1haEsxBbsgs +-> ssh-ed25519 eOAUSg KZxRUqX67VR1klwzqz9q0zb0XpLj9KnaJh4cgDuO3iY +kL+gbpEbCX2nCK+vfKIbdQBQMP0rudtD04SGWWmokm4 -> ssh-rsa REaZBA -g5/AsQTjPk/N6qzXNffBJ8xH61nSKsGFsgs2dVmjwBnWgPPrD2L7eFCKkVeEy5uM -aFgWTk51nZY7VpbibwH/mRjhZrQNkvtsFUvfGDQANPGXy1lhk3upq43iLGbf8IcC -qOG0/fWgvXWpkf6ZPnp2ahy5E60SKU695uBE0rNZRX8n9tX/njAFq2rASU2WS9H9 -w9Ld3bIpm7U77EMljQ7sYaP8dszd3CkMoi3MtH5rnzBlSH/ifyohQrOhfmhNZHU6 -kEjlTwRa760i5yM431hyXkWs1MkMn13rh134fTkxg8kI7pdojKt4H91WiwhVABap -285hVF+OXglRJI7jqw267H2M7UvGWqgFMFkXpTBn/Ds9aFsyF8C4JaMVV/zT9oqG -3xtP0SJaay0hOiUSz4thRox7CdOv799W2rqQGLXScky4ll5es1CX/YlLQr7eIemg -SDUhr1VWEpTs7+1rut7F8AV9AEppuy+k+QSRcw0+ms76i7OoDH6nYQlexiZ2BcKD +hYbeyJlamM8rA0Oqvmluj2C2FoaXBnOcIDR7n93SPtqG5gDAl2ww1EqqVhhU3+4P +JFioQ7akIZzm1aGMt7UkwtUkCpfZWaMYBsdjzJbfCMgeM9W7xTRkBSRqm1UdMvC+ +FNxErXgtuoXUKBolyTO83nkouroRhJc0ca7mMrFG3tPylHJeDktfAAGXsFB+0dIn +D46F1mlPxHGV1QhFeicNWSXIt1Lua9zSoWj5C+Irhcd/rLrkRzno4lniQOg/nvlH +Wxyg7lpO25jVifCGbH7U7epOAIjTuAPzpY+R8zQXTJY01scHCe7pFuyDdZGO3nkF +zzxBmYZpejTWa/qjgI1viUJnG627whLcYXd16Son+QPFmbo0POdue0JmnHdqhHWM +7H6qnNy8LL7JvXSCwlaNHTYSbEYcS/dRmYmU3YVQSCb857OVgggkxNDBrz/XXT6X +Fmb95V5ZafnejCCTKB9iUro7XDAVVK5kh7ebpXISQCQTIuMsKADFrfsgznGeWygU --> ssh-ed25519 J/iReg eCJHHRqu4yJ41OVqFMQ0419+1xE8OcfBoAcpGADfPVQ -W5jmItUpU1crfgtYWAsZdfG/dnfhjQNdt52Q0e9+0IY --> ssh-ed25519 GNhSGw 92SxscpXn08/+5hgGH2txZYpxMyTCE6QzArd4bTQngc -eQOgfzMsCFqjCJyYfAgFTVexlU9av/z71tDNL/cbYRA --> ssh-ed25519 eXMAtA JUzYhH9ARtKFnGd9d03qcoQZVWaxFESyZaLbJT3wVwM -vnXBLbUz940rJbloFHSIg5KE7miFXEq6fKKyO67rtjM --> ssh-ed25519 5hXocQ 5OrWn5S0Dv6QZZ4Bp3v4053fbBmsHGcUetEWa+mvN2Q -iktdo27wqYf/FE98g59p3Zn9Zda2AEwxkd0BcW/Cqcg --> ssh-ed25519 bRHVVA cYYvtFox+AR6FqufobXxiFV8u1+9LUYxXGxa+RzhRHk -v6VuMLViqatipD1pKZR15zr2q9RcqFU/8pvO5eS0370 --> ssh-ed25519 HgW9eA YJZAg4EgtmCw6nDI+3Baux2KoWqMLPg21YFlTgXds34 -MazzyiN93lrniBSnxMmKRGuS2Xae56BFI8jdWT79EEU ---- 9tBGnFdPK/K8RLNEZ3gxod0tzbf3KqshC74lDb1M/js -bô{6΢—íéÅ9ƒH»)‹n¬¹jdlk/ýi(?ÖàÆ´“ìr—lƒSÝá’äªîÛ�¢¯Ó.‡Eõß ¸£NÕ‘qâVuö1ãz)$9RŒ£+SÑ89J‚Jò6„þCpù±-dÜڣɘlsvìÚ/º^ËnÓå›IU73$| \ No newline at end of file +-> ssh-ed25519 xtvivQ wUUkc8+/B33c3570jreiei5VS9GtrCv97Iu56uLgo2M +/DzCo64M/OVkREh7vXqOejfd3NNh0Ks6El3LQUh6vbU +-> ssh-ed25519 J/iReg MYwFdjC2mTEICL2JHqRg691tdeU+r0XGqY9S/gdiJX4 +nbmM0qd+Dtya1bS1G2TYZj8bTEIlueMVzl4/K/aTxk8 +-> ssh-ed25519 GNhSGw LE/0n1c1gYxZYn0X8fE5dLJ9zOER57w3S7biDTmH7X4 +HqIJm+xzO52fNvCB6o8czFZSOR2bal3q+FUF6wtrJyA +-> ssh-ed25519 eXMAtA PJJ8UY3C8D7NzH37frLSWggIqoZKToqAKPxr3gJgXkU +onpUOF9Vwau2yR5NfVYegk10WipTlcXmuIoB+8sT7g0 +-> ssh-ed25519 5hXocQ SoaEOvR7wWyUuM5pLVI5Y9yglhA6Q4fe2XT5CUoKEFU +DFltxPnZvXsFcPGVheXUFu0ERZjbb/ZuHv3lYjfI/3k +-> ssh-ed25519 bRHVVA WPbmDqIhbODigyXs10FpNqdUEK0JaDwe22kZcBsoNiA +Ecl8dx9Gn+Q3bXiOOaMwYgWwKXyGgI6TzlBq7jjcyj8 +-> ssh-ed25519 HgW9eA xNGkBBx8slWpWqetytQ2zdDLPqATugrThusgeVWbzC0 +QNaJ7a89GtuAY1vsWvQ4YIX5tiKrbKiK0nXV4NECEJk +--- b1R5BDorRB8SjaHE+1GnU+im/6WnLty5kazy0qJnwtY +jÄ¿H58[R�Ò)BrÍ÷b•Ÿ&U;¶‰ÐÒà°‰©g±Ø¦™û‹e¯ý+-(ÓÇ�º§h’,š²ÖlÅì¸'ÇŸ5¹,;X ÒÊ ‘”„W½l +ß6—÷‚²-¨Ú}(ÐÛtõäµ ®e£+*«'ž�,b»X<ÅŽN“µ&#ù‰ \ No newline at end of file diff --git a/secrets/restic/nextcloud/base-password.age b/secrets/restic/nextcloud/base-password.age index b13a5a6..7f81bec 100644 --- a/secrets/restic/nextcloud/base-password.age +++ b/secrets/restic/nextcloud/base-password.age @@ -1,34 +1,32 @@ age-encryption.org/v1 --> ssh-ed25519 APVFfA thK758cqteGYd3zvMWNtQvBMIxWrFNqTyhFycMZ14kc -0Y6eYrMGHCg3jP2xVwE8gQQEUYgrKvmW1CRK/8HrCT4 --> piv-p256 ewCc3w A+Mcz+JbARKxXBPs64/fRY+zxE6uuOZJru86yS0wXLbY -1sX5108tQQ1UAE6aoMR0NnYmd2LK7OT6wnw1TKmPBvc --> piv-p256 6CL/Pw A0GorBRF12nh2obMr+RHCcUQNAEQeUc4IO1rPBZdgmLM -CJ5NONPMr9YUb0n2qhWQvk+xLSd62v1NPe+5I2HBGho --> ssh-ed25519 eOAUSg qMOCl4QKSHIZ4/+5zH5M6XogMUTV3QSELKPQM4j1gS4 -7zwUp6H6amlLbWIcOga98zKVlSCPlny/DF5VFhfO19I +-> ssh-ed25519 APVFfA JboWjPBQQtxZEENqQU6s5BM5qlKj+eGLGTTXiaiWHTE +6JUmliODHqMD6SWKgAwIIgMr+oaikU/Qa6vRff/A2R4 +-> ssh-ed25519 eOAUSg 7oW/eKB1Q3lsDcoE3C2E0htZV/zfw/pYbTFgINE1+ic +uB5PAt++5kSM3wNJyZ7Rtoovcbw+4HOsMEeBKwCqgo8 -> ssh-rsa REaZBA -eLuxDG6bAuzuEWyuFNyon7/D8McmXvVQbB4DUnCO1r2OXavIvfMbWhwcNT+wI/Iw -RJ58kwvk0rpQxl9LIzxs2e6WOAXverlW8ZWcMytr3kYonbfvvyKIYSHeQFG0B8aY -QZkZkmt8lyYXng81KJDY++5ti8jyUlVOgVd0yreNWbGjwOdFVqd23C0g+SfDkb5t -0VvxqeoPVzEgMIHnRccUuCbOSPbX9w5cU78aG1CNkuevY+UVGQhmqi8fKyA7+Cx8 -tgR0AbF+CwGyMg7B/15OIKKLVYKxJj7E4aOf6osLKpaLrtKGmfeYcNbwLb0f3+dL -if2AGJHeGcSCufplrUmAJTHjLP+ZVoD0jv9Tg731oJ+lsmJwqkQKvvbu6GyodjFF -RW6Choj5uZC89NIjCleIeV8N5VrRvMP7gyn0nPJm1EHKfSjz88492m379KUuvVOh -wFfVW2OqIziYuje3iPT6yHBOWj3MUBFfNuZmUOaH/IEQzpnXsOMp+5NR19sdxzIt +BYv4Uj6Oj/LDj/zFnkyocOCxWJf7nZjszr+qttfrGS/djoDEybOfZFsj3aKueNr6 +OIiRs5z0tWVK2fMD1lGqDGjLvSjdv0bfmYvfrpBmIO9+6zkjVsIMPc6dP6WaeRP7 +/kUWz9g1iJulShvbqOQ1SULgaeBmf0pRhARf+rGGISIeEf3eqZJi4rIyERwl9UZh +0UcdczmHRnAA0aXaXh3J0O0zs7Bc1pncFjndYffsaUVA6uZfnIpqE+BIlFbLTfed +ccIWLF6jm38dAjc4PxS8ND8igtNyUpv2vbihzHe40TK6tLKdDCydPIFQNL4/zxO3 +DYQs5XMKkdyO3QuM1S+YPlq/ng7p70UdkKSYPCxMvOl2vBYnFuytQ28IfYS1duU2 +0nCiaEn+YHnxRonqgAbM+6Fd9CQ7fUv0Ow0zSo9E4AXzJXcLLctn9pZHgfTDbvCZ +g9bkWPVYTbIbJR7XCl+NdlonnUZIjgstQr1cp+uPetGlVzZWjehWKz2bNhR0T4at --> ssh-ed25519 J/iReg PCqqUqmX7JPIqt26nsiv4/4Le0Zzw8RK46Muv5qC8GY -6q2oxmxLrdQRyAiKuErml/xIook6Nbx5BMCeNFaCjug --> ssh-ed25519 GNhSGw IRjxeqzzzvVSRIcYhOhZkejiOCq9l3P1sYltk/xiYlI -xRBgaNMBXZiO5aYZn/L/AKFnbiuu3hlDkYV2MkcUA7I --> ssh-ed25519 eXMAtA jH6fgmKMhBMyQ4pctjKVG41n8cJnvUqOw9MynaKP1Xs -tC8yehDvgjIKaM62tn3gld7nzlhvwe/p2t8qJjhil08 --> ssh-ed25519 5hXocQ 9eyLU1e3EHBiIlMEaQOov6MbNLmaz7SEgUhzRwj1X2M -GEWLNNYhMmypcHt4juzTME2bcAQ12iy6tTqZQCKE1v4 --> ssh-ed25519 bRHVVA qB6dlW+Q16DE+bwovrMU9lPjNowzACsStvy8Q1nZ9Fs -GyQwVn71mlzJvDznW7jmbbjlMnc0H4jG2+gMfJawhJo --> ssh-ed25519 HgW9eA oU8JTkoAH3yMOLcf3aKZ2RT7TtGgO0KlMLB2/hXzPXo -Oy8RdMThUlvU5mB+T+zlVBGpMgjwVBo6kU8Y7pekdqk ---- xzdtbFSZNHcOxsvALmpt5SWVTxrkvKeaZF2x2gEpHf4 -ÓTõÄ—_Σ ³{ÚDE8 hºè/C•ô¢t`3G½ ¶Ä»sö:I$Üõñ.7r6 œí@w3u9ß=§j‹n{úÿL�ý�¼ð¤ºx¸æºNŽ—µP´—‹“5¦ü'Ça„œêð,RPžÉ2Õ= v¿ûšd1s¼l¯ôctÎo &m‰6¤´|“0/×?� -ÀÙ™vö)˜!9lbxMtwê©ûÕ•ëg8�ý9`cNÕKZ<¥dÇâv%];-È{djµþóŽúQáuùÆ  ö‚¾!�-{a{’®ª‰ˆáŠBç0¢Ö1xœM]äMó†IÚô&JÒÛÛM2çRùºš©:½F½j/A÷ÆRbÚ=ZF;OmN�îµÌ¯md/ \ No newline at end of file +-> ssh-ed25519 xtvivQ +4eDsyOdsBdXhOvOp4kJCeLehzqVLofySrxR/U1qq2c +2Q634/p9zEMK0uPCDadmcepIcWi9EYC5X9LiKdT2BNI +-> ssh-ed25519 J/iReg u5Yo7dqP3i6CcE/F4SZ50JTo2araHbl7xU5frfp98S8 +GOjoKEUMXkdL6fpze9tDSMfmDRpw0pzbul0hlMjIn/s +-> ssh-ed25519 GNhSGw rgfYfj65+h0b1rvwH9yRI2d8fpEndYYpy9hw2QRObxM +j/KlMAOQIvFR0vGXAnbQLB9Mi1N5P39g11bc8krpzIM +-> ssh-ed25519 eXMAtA z6W54lKq3gCCM+vvav/FdWBIpGkVby940Ga1sjmCVzk +70fiex0e5D6eFAsLUCYcG5Upn8laUDyKOPiB0WFYF6E +-> ssh-ed25519 5hXocQ dbf8T8pMBp6imWDzV3Jmu5jHZeTVGMXxD5scHnTV2Ek +vsTR/daqavQJgd84SORjPN/CHFTU3qXlGnPpP0wa1S0 +-> ssh-ed25519 bRHVVA 1Gr3V4RiyA5WSOnNFmfxQNdSxBe39ndumHjwv1jyhBg +v+UecWKBCWqx9J1CmVbbxyANYCFMqJxbnJ1jdEDeOS0 +-> ssh-ed25519 HgW9eA H4l+ZcFNt43uS1Dbx6p3IuJ2Ox5xWyR4QclDmL7KHQk +4gjncDdCCasvUdcokHtPAWdpEJ7lbHq4RIMfSAnORwk +--- 1ksCvPhqaidUj4NrUkLB7qkk4iEZ0pUDeUjuzLuskTE +ùs·´ù¿rLçü¦]=÷4�Töˆ"àž6[4ó“ß@¥‹E] +×zŧíäÎéSŸ°ÓU›Ÿ”MçK¸üV¿¦"ΛÙJ€BËx²[1ݽ7€¡£B“x©ù—h°©’„"åv‹‚Ôß^îö×z{7>Q?â Le‡ £dÕ½¸"¯È¹OƒH#¼¥m{fÜóÂ…CvÄM•�´¿ýôAþzàj’v èÿ„²ëéf3ÿ.*WðÂ:Tú黤F˜ Fÿ[ 9• f,E.Ђ‘¿¤{¬ºc\a,3¸ª¢Ä–FN·VÕ>j‘ˆ"2 öø#‚ *õìžT‘÷€ EeàrÿMýû\rü ù—ÅRT+³8ÒáI!Äcm»› y½­ \ No newline at end of file diff --git a/secrets/restic/nextcloud/base-repo.age b/secrets/restic/nextcloud/base-repo.age index 6ab2143..24e7d7e 100644 Binary files a/secrets/restic/nextcloud/base-repo.age and b/secrets/restic/nextcloud/base-repo.age differ diff --git a/secrets/restic/periodique/base-password.age b/secrets/restic/periodique/base-password.age index 857e21c..6ded17e 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 daf1478..80ef3fe 100644 Binary files a/secrets/restic/periodique/base-repo.age and b/secrets/restic/periodique/base-repo.age differ diff --git a/secrets/restic/redite/base-password.age b/secrets/restic/redite/base-password.age index c3aa4ac..507e90a 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 3a42abf..43ab4c5 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 9750eb0..2200d73 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 1f9af5d..9d4d70f 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 c120517..b69f23e 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 40642a2..7a749ae 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 e1cc3db..2d53c3c 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 bad7acd..9b53f9f 100644 --- a/secrets/restic/vaultwarden/base-repo.age +++ b/secrets/restic/vaultwarden/base-repo.age @@ -1,34 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 TqxOLw m7ce2jpwWj58Kjno0mswFfOS02EwJ+bkJyv2Srj3hnI -REgPtnTeZQTnLXbYs4O+caEjmCaX9Zlzlz6lN8fiNuc --> piv-p256 ewCc3w A/KHcLtYfYoXmPVVIk8C37h1S3BdShwH+nFRi9ZSNdKw -sfHJH3/zHhKuteaD9qdmIVokJ9XSDQvfuUtK0MFrwug --> piv-p256 6CL/Pw AlSGBE7UQ5qBbbpPEpNIJRGDf7I0gi0cJpqTla05SniQ -mp6Ez4tuexbbbVMKH7SO1VwyrFDLa6n9X8cg3QP0W2s --> ssh-ed25519 eOAUSg BfcE7Z5qtPPuldnqC8qtSGRO1EYxnhdF7/VWv0gqGy0 -B4zrCqxBGbMJ7gf4TOzdXfcEZOvJfCPT8svpq8bd+7M +-> ssh-ed25519 TqxOLw puu8G4uwqORNIm3k5NdiGbzCliyfhwhC1Nv90c7yKhA +tKYk6PYQfIygfmZtp8mAiTHKwhqy2kRoews0sWyGvzA +-> ssh-ed25519 eOAUSg Lf9AX0kwMsAIaecrewxwPpPu2aMNd0UuzV3Vi5+GnSs +bLkaaNPXSLKl5oTFQMYvbXS+0AUhRXnnccrFO3ICI8A -> ssh-rsa REaZBA -MbK9qV5j6wlbpYerW1ManSzVMRzS7dU0YEyTNJKIFhL/bJyTUXRHX/ZlpJOqW2lL -LuBL0FkJoDhltHRQkcGZB1jcfOg+FyCdegYVgA+rqrm9UBNCvPSM1Q0MvBjI/9qW -vjdk72jqGpuA85yGRXPVClbfBBkxa7c+RB9wSLGqreDCkRUPJZTFs6YkeDPwQ9Hl -CV3+uzNKop6AtV2EaYWWTiuQdEzLkAX3tqAOyF6IV5+FGwbegHZsM9WMTzb8U9lK -5aJCle80A1ZdZ8sp5b8LCU7g9ictxdqRaZDSDK+E1HYjE8HGpV06UllmqICCxnws -++8Zvy8JXqRTTNXRMvdT8oFmuIuU+14hnl0LYs1zPxum7oBdWd/ua6wXK876epla -uOec9cPnB75pyCFerjvmKWVhZNrN4Xm67LeFnVHKLZRnxhmIUt+p/ymioe18Lw1O -gC/9/W1z2nkhVip1vujqOKDiRk+bQKimMFg+bK3zDueSZieUL6WjEBo1Z+uFfNKo +W/xGk/yM7fD9sNXH+3HwKdKlCq4lWM3V2qaBREdkgwQ8cc2tZZAJFBfl++pcUbz7 +iG6dEIP60IpwwE9oDhJUlRuB3DD07MDgZZioG632jBtWRH0qAQyjHOW8gODYTjTB +Oa5NeCUxAS2d+Sf5V9+vP6AzSh4W8p0aFMWCvqxcLpRzuYBSYnxqvQilKolrdGhO +4PLEgeAwukrhqiuPDZim/hhpnGItXGSbKgVGTHnxTBrpBIF3fRrCk5SZiG3S3LY6 +Z6rkvDbnLavtHPu+cLJbZJGQAKNKfv0e79rDJLlOiKtCd7miiPXeuJ9i7nYHbB6u +TxvoGQxpU9loWVSqonxYSeyg9YjPe9bpLvJbAiIxnopRoveN2K0UdNz2NLQXEEBr +F9DVlg6MZSd8WBub8ocV9hd0RPMM7XNfjcM1Fz2ia9Rg6/U4qI4XJOIm07YXd3UF +fMUsywiDoXZnux3uCNhiSGQoybcBwYdmvfvdmcF+DlC7wT03nyoU7IstKUJzqapk --> ssh-ed25519 J/iReg 9HhP0rRxPhVYYUbMp9RmB/70paCCOZzMXbiC59rZzQ4 -4Rnwk8dZPyACOXgFHegbulbfYomTR9ymftYJPpi5IhE --> ssh-ed25519 GNhSGw eB24dkkTe/5IHnkc2HDoEQ4ne3Kt6Gk10ANNOiTmBhg -qg0djg9oQNsyJqtJFrDU5w0ggNPHvasqcuScf1Tmuv8 --> ssh-ed25519 eXMAtA mnPmdNNDJVxqRuotVDiDjmbNBDJWOjIzEutjJQmkpEI -Qfel3hqCMeTwaIPjWGtwMxzPAcW/+uUh6HwbB4Waaf4 --> ssh-ed25519 5hXocQ Iy5Mdtbt8Q3hJw9MSRkED1LLru/1OWGQV1z8URRW9g4 -QFYMG/n63RANBdX3m048xD+jnKTOzEqO47mzLXsKvt4 --> ssh-ed25519 bRHVVA ZzQbVvTQJIOXtR3vEpKtsgSrIVXd53ejCjDGw68e3AA -B+bU6mr3j0a2Z6s2zW+H6rB5EzSV9ZFx79AagQ9CPIo --> ssh-ed25519 HgW9eA 4OTLSLBPA6JcHnomgXbv0NPnpvThtI7dU8bJowyaZx8 -RJGvJBd3V7pCbIpi1G+lbPsFkfyV7lJSoHkKODuKNjs ---- ri1zkahSrfRoGUecSHXCZ6RmLWd0Y9oAzyBfiDfbqVk -­ú@ñ@ÐZ“×þs- cñx`ÔwM1°ÌÍ~H; ÒÊœsw⬖•(�Ãñ6ŽxñŒeßX²z ssh-ed25519 xtvivQ yrLtHTwQpQkrQS3NYdh8Zul/4u7fOyY3ovaXKKyVAiw ++ZDjfJjA/5oRgElr+RtjH84CsFJ3705Dd4kpfT79Kds +-> ssh-ed25519 J/iReg puTpsZOfxvnyzsdeQdGgFlPI/hdvyEp50grO3bEiYlA +vAYhpom6nJPbqoAmqaBb8iauGVUt8l7PjFRDRwfcHlc +-> ssh-ed25519 GNhSGw Ld48TQUhIHTOmHt2fd9c+A5WYbhLVcJNv5vcLWBTEwY +NAbkZFczHrGAllIn2sN4xP7zEyKJf+X8xDngZPsQPvg +-> ssh-ed25519 eXMAtA ZPeVIMeOn/UKLRt/jDRctX45YOuR6hVW7e4FX8tb7hk +LX1IPG/mnE5yPAf9dM5XYilcEWm4ds6P77qYMLhWK2Q +-> ssh-ed25519 5hXocQ 11yInQbibqg4kBYQrnewOu7uYNXYSMjMF4wRJ2U6QmA +uqhv8NMK1Pk/ATWdPb19ysY95fjxxTrwJDd2izm7+GQ +-> ssh-ed25519 bRHVVA WrpHvBT/c7LHEZol/P9VtK679auYmozYz3WB1pPCwS0 +O+jNUdZtvjCED85eH1eZqCrhK0ntDMB//A1O4+WQJIs +-> ssh-ed25519 HgW9eA Ds65T1ecakchW2jFsc/Ma6fkiuPjmEtAA46fqnma9ks +jkkyVzJVxKY4bURb3gTRvnIX/yduyet88U3ZVEzaZzk +--- zt8ltGOWBkw+KQQ0ETsCpeOX0OFknpmlqmnx9T+srF4 +lÔá`�"ð(•½\~Þ‹Ô÷H5Z³(Ä\ ?’ÿn†ûßôz»v¤ç‚ý@˜YGt;ï&ù…ê–åìyVäŽ,–ÃÍoª Ò‰`¤(®°‡K�Eׄa×z\Úí(„ûUÙ�&ÛÌó±õÀt2ˆ©iH©hBDö=œU{Ô÷¢/'ÃáAÑþ§ëǶœ%Ó#]|²De�Ûˆû \ No newline at end of file diff --git a/secrets/reverseproxy/anubis-secret.age b/secrets/reverseproxy/anubis-secret.age index 578c302..c48145e 100644 --- a/secrets/reverseproxy/anubis-secret.age +++ b/secrets/reverseproxy/anubis-secret.age @@ -1,33 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 GCcVXA qD1f4YdP88JvuPLS6H416O0LF+rKN/gJ+gPf0lFWIRs -B0LuHjXX0UiHHTwY7v1HqP4VF5/5yn0d/gNW4zUOC5w --> piv-p256 ewCc3w A8Wnjz7tLNpV/m5bUzuq/MBTHn+jQiaCSUb4vFvGDH7N -gNBEsgdHogaz3OSJBelB39bGrOBt8+hkNXpAYcFcy28 --> piv-p256 6CL/Pw AoJBcpyhK+hpZOfHOBUHh0Kivvn6YJ4xepo7IWppbMuJ -f1fwsu8okH7F+6nSHowxHpTdtjU72lvd6FmwFIMmV8E --> ssh-ed25519 eOAUSg 0bH2dDdNzKapr54HKndKJpKO5iTQtbhY957NIJQcvBo -LYVsTuKNsE4JlBxbf2e+Qo9ZjRxnz6saEHEjyfCcAjc +-> ssh-ed25519 GCcVXA fFjFIQNufMl+vs4G+kiI8rfIHC29WIT8o3BUliYTfFU +scL2o4LqWpyJgzRqx9wiOtJVFnS5LkpjMioK5ccKqFo +-> ssh-ed25519 eOAUSg isulQg8cMAintaA+XM6apsaaXHm5KeoHuH6hQ7wi42s +MAlBaVWcth9nT3/3b0YJS8ORZsiZKGzcbhQeVROjkbc -> ssh-rsa REaZBA -Pho7O15lWd5/2Uy1OQmA/JzE0wmOji6IPKGj03nK9aYSQjsTTc30YhNCrkddglGX -MCClDyGDlQ0mCwHKVfpFeeSC9VQWQDDYk90dM4MF//6hHPqU/zn8dR25NyxDgyyi -DVrCFB+S09LsKI4isbDoCru6fWXfdN4Fj8I44c64dBpIVh4XhSzUtmlzmge//35C -y6EvAjVIhVTbbgnQ5CJFgnRlSPaN5BHDq76aJ3c+8Ajkjowa2YcYu7w8asi7PsIs -WH6J2qMIPvPdxOEKczGc401ysUfz9fNFKs0Xx4spduwv8I3Sv4ImURDkYmCl/k7J -rwRXbUGr8JzZu093cmkjVxDrSfb9VhqlZVJD7uc2VSTk8ntwStLWafSuE03bIN2L -on0t/4/wXtvFtwlGoDe9QGYAJpPYWM0ZUPMZfpddOz9vYvL1+6nUcDroLMvCIItI -blwJZ0970K/Je99SmI3+6mUEAw8nJ/pBFaF/LmTJecypLEalLNsu2IALyCMIdTa0 +OoGu5Wf5dXSZrx99GriT1Mu+KlFlzfNG9D44fAq9BjOsNfezAfUFO2/qjAmgrozi +R8WKghAr2No9DsCODgQLhw93Nzo5WhqBvUH16b9lWpF5NesJkMk4NGh2Kscbcrlb +TiP1GBa1f7uuEa3Hb3YA64MJoDJkps5p77vtjxNPvHvDAMGffup7IfIsGMJ1dDYB +G6LfOP7AbiCLmNrNDIo1X0d35knNluYmTfxZzFeTwDL2MhI0R8GwaxIcXbybKipq +F1ZtyKO7gwrlog1nGKd3jmecC3VFyvydzFCN+h3AYZwOIpfSGPHCY1KUh2CebFnM +I6LYr73uF8BkubXBkaMSfhaiwiYfAnhAZSI8pSVVfbJMhse9cclZYAY92ckKsp8T +JbsWK1sTeaeqSvItjFOKa3sWWyXJJ/WxtZLYupN2r9yRwESkGUCinBM+fJunCSaG ++Zh2UZNxJoibHoFs/uuJjtw6zeYCaLu4/mjn6vr1kFG/LGFLSBCfatRj4uSZT2Yz --> ssh-ed25519 J/iReg fpgi4t31rVl+KvOYd0Ph0Nd2gInJAZXNhQC5ekpv0kI -lznh3YwmqVr05vjWxf1HKRWAFZGXbypAYygjUe+ELlk --> ssh-ed25519 GNhSGw 2cVptD/h5NWcYsjPPwQcP/b9tjJPDbhjDKh2hKhA5GM -JZvQvXkb1RRw+NHnJ+HMV5tlwiBnLf4+cwm6J2hZD9Y --> ssh-ed25519 eXMAtA axP3hHgfgWJScGLIGpYgu0iYW1qZRQzMK9XjIeszrnc -rBzAqSVoRqj/drZSOlxSIZLgZZU/wqGML1gKCEHtcy4 --> ssh-ed25519 5hXocQ b3kjoM+FfQ434V7X8FdpIHVFjTn4sc+psj+9jyRljxU -l5rna7ap0ydVXPCSr4qrPnu2MV2n7XwoSh/T87OkuMU --> ssh-ed25519 bRHVVA 92Rj1gMmueSHWzxsKWVs+7nF4JzuekhfaB2u5AWnazk -yg4qa9lyHsGCOXWOTm7/XH9F8JzvRLjzsxyXe88oXnE --> ssh-ed25519 HgW9eA mpIFRqMXj08JuyYLf6Hx4p9fOLbxXZquSMAjh0e/lSU -h1kvwnu+mLOeRfVFUXgE9IDo/MQ+4gtkYwrF3JWQfwY ---- MCDm2NH5NWgwnFYQ+zJ4obfdxWpiv3BGohnIJ1bRkco -_Ö¹`ðãFËÉÑvF3[;œç197%»4¼90MÞ[ï¼Ip¢:Ÿs|ÈñC�RÃ6,CÔè÷;á[³;<§Éû¤b(´fqÀg8îp÷p÷ ÷Dk p/ÐwîÒ¿$9Ý\ \ No newline at end of file +-> ssh-ed25519 xtvivQ RfiQ3XW2QDe3d/RVJl8MAbfGrYcPwMb3pafjgh3nAmc +7ifIXHpPmWyefJZTa8UIxMSDYSyaINjV2HER4wFRMuI +-> ssh-ed25519 J/iReg X6QpVSEaxkEOCOk32ZhrZIe79NW/SqK+emzt+rlym2g +iAHEgduXczzFvcOedBhBujB5qjROv4K+zegptj53hX4 +-> ssh-ed25519 GNhSGw 37pYYtFV44ZgfcjdXz1d4S4nVLl32qrjZLZ3/eevNFM +gL+YPCyQaDE2B1CIkjQogW/J0pGBW7QDm+UMKk6+hHQ +-> ssh-ed25519 eXMAtA bun/QDr4yeoZv8U6stAkiYygRQaJUEbkn/qb8YXmXT8 +34ZQGhUOois/qlq4suQ/wnegMu6VsUUKTY6KIl4xyfY +-> ssh-ed25519 5hXocQ 0o7tah22EA2s2p2xftu3qpUQ/1IJRVYtH5vGguhzsn0 +3OaOxH1EMLzQ3yi7jS49dRD3wnT1DV+oSClJnmw9peI +-> ssh-ed25519 bRHVVA HDRjKyvH1G92flePvT3WHR7vDcNxZ/xA1giIkoi+0xg +P+p+XHDmcMcejpBmqGdoLmLxbKR0gznaROJurUa5XeA +-> ssh-ed25519 HgW9eA Z5wNkLdKadDRPnK7ViK2OlEACqjb6SOk6cUfwy0peB8 +fLZFBIoE1FiHTCs+OLHSgGM9pn+VoYDNtSZ1yN8rQxs +--- 2pUOEZ0nBx9RI3Z4CZM79hJt4Rd9e+tEJ/6AODLZ0Fw +Ï Ep¨b1r€SW2‘‡(<Α¯›ø�yQ™Ô>Θܦ�pâêîÞ.lúʯ ƒÀÝà¦l‰%�߬¥+ÿý' Ñg]�«t©(z'ÎÛÌ.B–G(v¼@@Ô!h“£ \ No newline at end of file diff --git a/secrets/vaultwarden/env.age b/secrets/vaultwarden/env.age index 73db5a6..38efbaf 100644 Binary files a/secrets/vaultwarden/env.age and b/secrets/vaultwarden/env.age differ