diff --git a/darwin-common.nix b/darwin-common.nix index 8a8d31bb..cabac05d 100644 --- a/darwin-common.nix +++ b/darwin-common.nix @@ -6,7 +6,7 @@ nix.package = pkgs.nixVersions.stable; nix.settings.cores = 0; # use all cores nix.settings.max-jobs = 10; # use all cores - nix.settings.auto-optimise-store = true; + #nix.settings.auto-optimise-store = true; nix.distributedBuilds = true; nix.nixPath = [{ nixpkgs = "${inputs.nixpkgs-darwin.outPath}"; nixpkgs-master = "${inputs.nixpkgs-master.outPath}"; nixpkgs-nixos = "${inputs.nixpkgs.outPath}"; }]; nix.buildMachines = [{ @@ -18,16 +18,17 @@ sshKey = "/Users/ragon/.ssh/id_ed25519"; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUorQkJYdWZYQUpoeVVIVmZocWxrOFk0ekVLSmJLWGdKUXZzZEU0ODJscFYgcm9vdEBpc28K"; } - { - systems = [ "aarch64-linux" "x86_64-linux" ]; - speedFactor = 2; - supportedFeatures = [ "kvm" "big-parallel" ]; - sshUser = "ragon"; - maxJobs = 8; - hostName = "192.168.65.7"; - sshKey = "/Users/ragon/.ssh/id_ed25519"; - publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUM4aG9teFlQZlk4bS9JQ2c2NVNWNU9Temp3eW1sNmxEMXhGNi9zWUxPQkY="; - }]; + #{ + # systems = [ "aarch64-linux" "x86_64-linux" ]; + # speedFactor = 2; + # supportedFeatures = [ "kvm" "big-parallel" ]; + # sshUser = "ragon"; + # maxJobs = 8; + # hostName = "192.168.65.7"; + # sshKey = "/Users/ragon/.ssh/id_ed25519"; + # publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUM4aG9teFlQZlk4bS9JQ2c2NVNWNU9Temp3eW1sNmxEMXhGNi9zWUxPQkY="; + #} + ]; nix.extraOptions = '' builders-use-substitutes = true ''; diff --git a/data/monitoring.toml b/data/monitoring.toml index 26d493dc..ad6ef86c 100644 --- a/data/monitoring.toml +++ b/data/monitoring.toml @@ -4,12 +4,6 @@ ip = "beliskner.kangaroo-galaxy.ts.net" # tailscale [hostOverrides] -[exporters.nginx] -hosts = [ - "ds9", - "picard" -] - [exporters.node] hosts = [ "ds9", "picard" ] diff --git a/data/pubkeys.nix b/data/pubkeys.nix index 8aebf73d..5d08c032 100644 --- a/data/pubkeys.nix +++ b/data/pubkeys.nix @@ -15,7 +15,7 @@ let picard = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAm3UXZaN95WBUaS9SiHLNEuI1tP1x1w07qnYxPe+vdr" ]; daedalusvm = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJCNGGsnAPPmhQnEMBWJulM2pi3pw/tdX1vi3l6cRky" ]; octopi = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+0/lwNc/KN8LrS3KvDCuuipQokO+7qELfksepJXz6a" ]; - beliskner = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+0/lwNc/KN8LrS3KvDCuuipQokO+7qELfksepJXz6a" ]; + beliskner = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJumJeu6QjTUan7UiRkH7EAEcMXZSky4UsW1bci24hfM" ]; }; in { diff --git a/hosts/beliskner/default.nix b/hosts/beliskner/default.nix index ce7ee0c2..d69c4a22 100644 --- a/hosts/beliskner/default.nix +++ b/hosts/beliskner/default.nix @@ -39,6 +39,7 @@ networking.defaultGateway6 = { address = "2a00:6800:3::1"; interface = "ens3"; }; networking.defaultGateway = { address = "195.90.208.1"; interface = "ens3"; }; networking.nameservers = [ "1.1.1.1" "8.8.8.8" ]; + networking.useDHCP = false; # networking.interfaces.eno1.useDHCP = true; networking.hostId = "7c28236a"; @@ -54,9 +55,28 @@ root_url = "https://beliskner.kangaroo-galaxy.ts.net/"; }; }; + services.grafana.settings = { + analytics.reporting_enabled = false; + users = { + allow_sign_up = false; + }; + #auth.proxy = '' + # enabled = true + # header_name = "X-Webauth-User" + # header_property = "username" + # auto_sign_up = true + # allow_sign_up = true + # whitelist = "127.0.0.1, ::1" + #''; + }; ragon.agenix.secrets."prometheusBlackboxConfig" = { owner = config.services.prometheus.exporters.blackbox.user; }; + users.groups.${config.services.prometheus.exporters.blackbox.user} = { }; + users.users.${config.services.prometheus.exporters.blackbox.user} = { + isSystemUser = true; + group = config.services.prometheus.exporters.blackbox.user; + }; services.prometheus.exporters.blackbox = { enable = true; configFile = config.age.secrets.prometheusBlackboxConfig.path; @@ -69,54 +89,50 @@ virtualHosts = { "beliskner.kangaroo-galaxy.ts.net" = { extraConfig = '' - reverse_proxy :${toString config.services.grafana.settings.server.http_port} - forward_auth unix//run/tailscale.nginx-auth.sock { - uri /auth - header_up Remote-Addr {remote_host} - header_up Remote-Port {remote_port} - header_up Original-URI {uri} - copy_headers { - Tailscale-User>X-Webauth-User - Tailscale-Name>X-Webauth-Name - Tailscale-Login>X-Webauth-Login - Tailscale-Tailnet>X-Webauth-Tailnet - Tailscale-Profile-Picture>X-Webauth-Profile-Picture - } - } + #forward_auth unix//run/tailscale/tailscaled.sock { + # uri /auth + # header_up Remote-Addr {remote_host} + # header_up Remote-Port {remote_port} + # header_up Original-URI {uri} + # copy_headers { + # Tailscale-User>X-Webauth-User + # Tailscale-Name>X-Webauth-Name + # Tailscale-Login>X-Webauth-Login + # Tailscale-Tailnet>X-Webauth-Tailnet + # Tailscale-Profile-Picture>X-Webauth-Profile-Picture + # } + #} + reverse_proxy { + to http://localhost:${toString config.services.grafana.settings.server.http_port} + flush_interval -1 + transport http { + keepalive 310s + compression off + } + } ''; }; }; }; networking.firewall.trustedInterfaces = [ "lo" "tailscale0" ]; - services.grafana.settings = { - analytics.reporting_enabled = false; - users = { - allow_sign_up = false; - }; - auth.proxy = '' - enabled = true - header_name = "X-Webauth-User" - header_property = "username" - auto_sign_up = true - allow_sign_up = true - whitelist = "127.0.0.1, ::1" - ''; - }; services.tailscale = { enable = true; permitCertUid = "caddy"; }; + age.identityPaths = lib.mkForce [ "/nix/persistent/etc/ssh/ssh_host_ed25519_key" ]; ragon = { cli.enable = false; user.enable = false; persist.enable = true; + persist.baseDir = "/nix/persistent"; persist.extraDirectories = [ "/var/lib/tailscale" "/var/lib/caddy" + "/var/log" ]; services = { ssh.enable = true; diff --git a/hosts/beliskner/disk-config.nix b/hosts/beliskner/disk-config.nix index 5c29f151..416beb38 100644 --- a/hosts/beliskner/disk-config.nix +++ b/hosts/beliskner/disk-config.nix @@ -16,9 +16,10 @@ flags = [ "bios_grub" ]; } { - name = "ESP"; + name = "esp"; start = "1MiB"; end = "265MiB"; + part-type = "primary"; bootable = true; content = { type = "filesystem"; @@ -33,6 +34,7 @@ name = "luks"; start = "265MiB"; end = "100%"; + part-type = "primary"; content = { type = "luks"; name = "crypted"; @@ -46,6 +48,7 @@ }; }; } + ]; }; }; @@ -55,10 +58,10 @@ type = "lvm_vg"; lvs = { nix = { - size = "100%"; + size = "100%FREE"; content = { type = "filesystem"; - format = "ext4"; + format = "xfs"; mountpoint = "/nix"; mountOptions = [ "defaults" @@ -79,16 +82,4 @@ }; }; }; - fileSystems."/var/log" = - { - device = "/nix/persistent/varlog"; - fsType = "bind"; - neededForBoot = true; - }; - fileSystems."/persistent" = - { - device = "/nix/persistent"; - fsType = "bind"; - neededForBoot = true; - }; } diff --git a/hosts/beliskner/hardware-configuration.nix b/hosts/beliskner/hardware-configuration.nix index 3d40e61c..394b75b5 100644 --- a/hosts/beliskner/hardware-configuration.nix +++ b/hosts/beliskner/hardware-configuration.nix @@ -16,8 +16,8 @@ in enable = true; port = 2222; hostKeys = [ - "/persistent/etc/nixos/secrets/initrd/ssh_host_rsa_key" - "/persistent/etc/nixos/secrets/initrd/ssh_host_ed25519_key" + "/nix/persistent/etc/nixos/secrets/initrd/ssh_host_rsa_key" + "/nix/persistent/etc/nixos/secrets/initrd/ssh_host_ed25519_key" ]; authorizedKeys = pubkeys.ragon.user; }; diff --git a/nixos-modules/services/monitoring.nix b/nixos-modules/services/monitoring.nix index 23fe805d..cd3db955 100644 --- a/nixos-modules/services/monitoring.nix +++ b/nixos-modules/services/monitoring.nix @@ -25,68 +25,28 @@ in http_listen_port: 3100 grpc_listen_port: 9096 - ingester: - wal: - enabled: true - dir: /tmp/wal - lifecycler: - address: 127.0.0.1 - ring: - kvstore: - store: inmemory - replication_factor: 1 - final_sleep: 0s - chunk_idle_period: 1h # Any chunk not receiving new logs in this time will be flushed - max_chunk_age: 1h # All chunks will be flushed when they hit this age, default is 1h - chunk_target_size: 1048576 # Loki will attempt to build chunks up to 1.5MB, flushing first if chunk_idle_period or max_chunk_age is reached first - chunk_retain_period: 30s # Must be greater than index read cache TTL if using an index cache (Default index read cache TTL is 5m) - max_transfer_retries: 0 # Chunk transfers disabled + common: + ring: + instance_addr: 127.0.0.1 + kvstore: + store: inmemory + replication_factor: 1 + path_prefix: /tmp/loki schema_config: configs: - - from: 2020-10-24 - store: boltdb-shipper - object_store: filesystem - schema: v11 - index: - prefix: index_ - period: 24h - - storage_config: - boltdb_shipper: - active_index_directory: /tmp/loki/boltdb-shipper-active - cache_location: /tmp/loki/boltdb-shipper-cache - cache_ttl: 4h # Can be increased for faster performance over longer query periods, uses more disk space - shared_store: filesystem - filesystem: - directory: /tmp/loki/chunks - - compactor: - working_directory: /tmp/loki/boltdb-shipper-compactor - shared_store: filesystem - - limits_config: - reject_old_samples: true - reject_old_samples_max_age: 168h - - chunk_store_config: - max_look_back_period: 0s - - table_manager: - retention_deletes_enabled: false - retention_period: 0s - + - from: 2020-05-15 + store: boltdb-shipper + object_store: filesystem + schema: v11 + index: + prefix: index_ + period: 24h + ruler: - storage: - type: local - local: - directory: /tmp/loki/rules - rule_path: /tmp/loki/rules-temp alertmanager_url: http://localhost:9093 - ring: - kvstore: - store: inmemory - enable_api: true + analytics: + reporting_enabled: false ''; services.prometheus = { enable = true; @@ -116,6 +76,8 @@ in services.prometheus.exporters.smokeping.hosts = [ "1.1.1.1" ]; } (mkIf (builtins.elem hostName cfg.promtail.hosts) { + systemd.services.promtail.serviceConfig.SupplementaryGroups = lib.optional config.services.nginx.enable [ "nginx" ]; + systemd.services.promtail.serviceConfig.ReadWritePaths = [ "/var/log/nginx" ]; services.promtail = { enable = true; configuration = { @@ -137,6 +99,45 @@ in target_label = "unit"; }]; } + ] ++ lib.optionals config.services.nginx.enable [ + { + job_name = "nginx"; + static_configs = [ + { + targets = [ "localhost" ]; + labels = { + job = "nginx"; + __path__ = "/var/log/nginx/access.log"; + host = hostName; + }; + } + ]; + pipeline_stages = [ + { + regex = { + expression = ''(?P.+) - - \[(?P.+)\] "(?P.+) (?P.+) (HTTP\/(?P\d.\d))" (?P\d{3}) (?P\d+) (["](?P(\-)|(.+))["]) (["](?P.+)["])''; + }; + } + { + labels = { + remote_addr = null; + time_local = null; + method = null; + url = null; + status = null; + body_bytes_sent = null; + http_referer = null; + http_user_agent = null; + }; + } + { + timestamp = { + source = "time_local"; + format = "02/Jan/2006:15:04:05 -0700"; + }; + } + ]; + } ]; }; }; diff --git a/nixos-modules/system/persist.nix b/nixos-modules/system/persist.nix index e36f5bdc..bf3efffd 100644 --- a/nixos-modules/system/persist.nix +++ b/nixos-modules/system/persist.nix @@ -12,9 +12,13 @@ in type = lib.types.listOf lib.types.str; default = [ ]; }; + options.ragon.persist.baseDir = lib.mkOption { + type = lib.types.str; + default = "/persistent"; + }; config = lib.mkIf cfg.enable { - environment.persistence."/persistent" = { + environment.persistence.${cfg.baseDir} = { directories = [ "/etc/nixos" "/etc/NetworkManager/system-connections" diff --git a/secrets/aliases.age b/secrets/aliases.age index 5e48bd36..b201a710 100644 Binary files a/secrets/aliases.age and b/secrets/aliases.age differ diff --git a/secrets/cloudflareAcme.age b/secrets/cloudflareAcme.age index cb92cc86..d91209f0 100644 Binary files a/secrets/cloudflareAcme.age and b/secrets/cloudflareAcme.age differ diff --git a/secrets/ds9OffsiteBackupSSH.age b/secrets/ds9OffsiteBackupSSH.age index 29e35b54..1d31dcf4 100644 Binary files a/secrets/ds9OffsiteBackupSSH.age and b/secrets/ds9OffsiteBackupSSH.age differ diff --git a/secrets/ds9SyncoidHealthCheckUrl.age b/secrets/ds9SyncoidHealthCheckUrl.age index 7fd5adb3..88954b3e 100644 --- a/secrets/ds9SyncoidHealthCheckUrl.age +++ b/secrets/ds9SyncoidHealthCheckUrl.age @@ -1,18 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 IbXxfw KdezeWyqCVGJj3x4zfwoT+LNrbu5EBzGX/cUnf6c2g8 -zdZSueJRMwGkO9cUkKQmuoftgyl39fFt3I4kG97gIGk --> ssh-ed25519 ugHWWw YGgxsODirKYrqoxA86nGATPhfnOJZcC2f9NPu+n73m4 -vuoYHUNsdwBSVga8L0DKuda710vx1y6aMz4XDcmFXGQ --> ssh-ed25519 UU9RSA zLgGY7hf63cIb4qgZiumH6nIX2lDuekR/KIZZJCU+mc -sKR1aqrYFgfMxzZCTjTA/WANKXhreweZwJzZEqW1pNc --> ssh-ed25519 RJI3BA YMNxwQ9bjAUot49wEPl0qdSJrTGfzeZkowrTdtK83RY -YAiAGgAKce//MjuQONqyGcMhu1Wj+u4kr5SJmcZ/0qE --> ssh-ed25519 XnvJKw p2wkolrLOrqcmG041jgqLy+3wyFsYuFO90ln1YLPnjg -4LdNcNLAtC54FzipQVNovh31mCgQDBDBR2EE+N73YIo --> ssh-ed25519 7NL5Ng 5mzUYqTjbcZxS2WUeX1guyvz3q93PvAn7tzmDD3dBDg -Yg2z5LTek6B/AhDB/A5/VM1bEPEPNEZxnDH6gtKl7JQ --> 3N-grease @ 5Ycr .c9Ofe&B -+M+ZEPIc2FLzFgxvS03huYsiDyxs2FOZBPVgL+TfzWr+j7IEX0W82k5E3+e5KaGR -/Ebh5wFCwOOgbU0aTb/tqHeTDt3kmZNaXeuz4BaXhr+Codo ---- cvow+MX9rRtwqLbi4rBXInhFbd9k5jCb44+2mhzj6SQ -M#τD;| XU9U.ުi1ٙbǦH cD[5C6oʨ{Fc8"0 \ No newline at end of file +-> ssh-ed25519 IbXxfw 731OHRDfSRIivn61saYQ0hp9cYSWLuytK3fAPcUUsDo +D8z49qMjFmL/8zufy9zrjlN3/F7xSHWgU+dCCvTQ2K0 +-> ssh-ed25519 ugHWWw ZGxD6ewLQLC4O2T1jI2M35LW/o93oYwTE/bQ5gsT7Q4 +nJVtUl2GtK77TlPa0yc88Wuv60mohIbZhbKkkqKHdZc +-> ssh-ed25519 UU9RSA KzN5/fifyC6wkkpXneLU6Mli1wgXO8y3mZFdjFfMhng +EBeq1nfFQ/3U7vEdwep54xUTj+dMo/cXZbgbgK0KK7w +-> ssh-ed25519 RJI3BA 0rBtFJth+FnZ+nEouCD+8ObOZa9Rrqn9QV1yFCOTmUw +gUo6OfAWU2nG4lfIYC/20U2atEuFMq4Q3MnI1sRBzSI +-> ssh-ed25519 XnvJKw jo7ZwIVFxrnn6UfIzBraN1y98z/0Q53i1r8nxOZuuyg +87ftHiGXjDovPUt1K8DvQ+jUq4t7QCEv1bXCFZFUV6c +-> ssh-ed25519 7NL5Ng O1Xh6tusIJl6ZsTKm8BS01pHdivmvP1YObV4y8uNnD4 +WtGw1PH+H7uu30k1ESY+FSBF0wZl9EozaxuYy6cc7T0 +-> *`-grease 6gkld] PP2%.wT &U3 =*}'~z +on9y4/vL4UINvYSQbsomKSdpBUB1mUyVcRTJ +--- Yrdjt5K+uuUYZmGNKo9mh7kHk312ZvsCCPZjqdOkRiw +3טQ:hen/_VnjCexteAEy +܆,2 Ux [EPvVQ{1Rl7G \ No newline at end of file diff --git a/secrets/gatebridgeHostKeys.age b/secrets/gatebridgeHostKeys.age index dc075e98..e0f24ff9 100644 Binary files a/secrets/gatebridgeHostKeys.age and b/secrets/gatebridgeHostKeys.age differ diff --git a/secrets/gitlabDBFile.age b/secrets/gitlabDBFile.age index 5ad508e6..1c4e3008 100644 --- a/secrets/gitlabDBFile.age +++ b/secrets/gitlabDBFile.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ b9+AasMklXdDJvNzaEd/sh9HJ+SDcgwF4dbryk/rrwI -AWD89EOgpvL24jCPLRlhAg1b/6rwaCX/jONULgOkrFU --> ssh-ed25519 ugHWWw 2WWyI3Xhd0oVWDyTAv1W5quE9Rco7w7p6HVfPHP28CU -SJfRG8yHteoUaM/V7vHlHG2XYmIfbjOiispobT0cBXg --> ssh-ed25519 UU9RSA GpTYwOKjRU4xNXZQ+Cd4DcbMbNy/9DTE9qcRonZj0zk -aHqBALdAnGMMmmUsbrfBJgmD13fDuMcWa2WMf2Dwe+M --> ssh-ed25519 RJI3BA RdzGEnQykpZzcKWyjSUynltDhijPWJPrR1knhAedvEk -bMvdyaQpLca19Sejn/DG0IN0HkqpmuWIarhc0Bqd610 --> I5PWX-grease -doGrcnZB+gt9co3chYiimN0+g4SabKtOVJ4 ---- C9VuCDj9K/ECbvBR+GOa/tkUB+66v0jXwIlSAykFcu8 -F"n[tx1NANR,-A5tH1k@X;JfȨT1\A{W~E8hM ssh-ed25519 WceKOQ dgn/tUiSbkO3dQDEnRjDrsZVh12WE6vOxs7+5+ryz3w +VOuyJiqFWCeUUtKqRc6OOHj9DiAZ77iNOBKdK9gmk9I +-> ssh-ed25519 ugHWWw KfYlvKPAbaRtdIq4bxghKd5o05apHUc4G2cxdzC+4D8 +r31muHzOl7tqR50ZNBhLsimv5gOBIXy26gq5dMEFOYo +-> ssh-ed25519 UU9RSA HJp0A1+6Oj9g26W+1ziOOHwqugLFMrGfagGWhIi2Pmo +P5sKA0ljthCeQttssHoxIlbcwNHeL1SeLxyOtSuzRZQ +-> ssh-ed25519 RJI3BA m9SvZdZGQOpfdBWxzEOuGv7AdhRdiKdKAaTgJ+qz4yo +YfhheTuFUAWZ5Nx4j0bTb9YpzHspQulAP0E8t8w75kM +-> ssh-ed25519 XnvJKw 2aSNPEWIXcuYxrCIDKft9DQO3MjhSYPNOkb4OpaaTGA +sBRjNa7Ty48DS2K0EvXB2CLTwOYuDhbao5XfzG6tThg +-> ssh-ed25519 7NL5Ng Kv7saPGP47TeA++XX18R+aXDQrvUViRBZ2pb3S26eQ4 +sBzRisNUy5jAI2NcwLpC4yA/kMUQvMTRXS/OZsvOL/0 +-> $L8XHf-grease +xl5GHbcyCpd1QcJ8v6Zd256M81w/WKiitWllKnS4J8qJ5TsK6dGwTx0sKLSLU7v5 +DvUcD1IrBIHO/Nk7uSE +--- zzOAzBpN/9kfUigndEGq5iji1+lbs/VgPe2yWJDH8TM +G.r{|فUog uJ3ҦrY q`& ;iLlY"]AUA`Rt͓"ZBt̯Ѐ \ No newline at end of file diff --git a/secrets/gitlabInitialRootPassword.age b/secrets/gitlabInitialRootPassword.age index 50d649f2..d315dd9a 100644 Binary files a/secrets/gitlabInitialRootPassword.age and b/secrets/gitlabInitialRootPassword.age differ diff --git a/secrets/gitlabJWSFile.age b/secrets/gitlabJWSFile.age index 06caced4..ea0b60ce 100644 Binary files a/secrets/gitlabJWSFile.age and b/secrets/gitlabJWSFile.age differ diff --git a/secrets/gitlabOTPFile.age b/secrets/gitlabOTPFile.age index ab5e3fc4..3863a435 100644 Binary files a/secrets/gitlabOTPFile.age and b/secrets/gitlabOTPFile.age differ diff --git a/secrets/gitlabSecretFile.age b/secrets/gitlabSecretFile.age index e8b9cc25..58f8ec8e 100644 --- a/secrets/gitlabSecretFile.age +++ b/secrets/gitlabSecretFile.age @@ -1,14 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ Mij75ZZ6ZkEWBeT7oVRZ2YihXQQBTtQVZS8BDuxxuCM -8X8zp8NtutWQ/1sB6P+JrV1ScAlMMni0rtJ4mmvO+Ro --> ssh-ed25519 ugHWWw J2D9VkJ9CxbdJUKUfmL7UdbeVyyJLmt2oJ2cKaX7fC8 -B5tTxccNrepoBrVQR8F2DC1oM0bN+iKYg8Ot0scrPWU --> ssh-ed25519 UU9RSA m04wst9rOG+SDglrF90J8jCFY+rB06H2dgfdXd62UVs -4FZTRyeT4bx3E+cnTtyBI9C/m3XIYbXIq7eWz79/SjQ --> ssh-ed25519 RJI3BA 4gi2v5Z+LtCqrj2YiEvmPlJlPnXgr7PQwzh67DA5Uxo -e1W0Q8Fb52MwYFlgI0uvFEnaS78bHyVdeg9ehk0F2rk --> aH-grease ],3b@i mp_ 3m=!n!f -2ryDTLBvpf2ddjP1gzRfqFbvsYJvttaIhQ ---- +9bjbQrzG0BKCKnm6Xwinq4VTz7GbrndR4VkdM+L3Rg -uBKHmjN<.SUȬS Bs:+,Q }ýrPK2& -ٓڜ".QEN?Fɘ:н-/avq[ \ No newline at end of file +-> ssh-ed25519 WceKOQ y2DQyasiozHpflSW+Ozciu8s67q3g4A0MFcpfhTVhEk +Y36WK0zbxoPvD6aKj4udYLg5yO4R0Aqhd1QJMizGYXk +-> ssh-ed25519 ugHWWw pVz0ayoddMz8FE2+ZpT1XdYAjN6FTfPyW2ETWZLS7l8 ++mcTMXOQpaJ7ldcPDORpYHiXr/E6omugL4XL4d2msVo +-> ssh-ed25519 UU9RSA 8J2t7JNZ/kIkLpIo1Ii72bOwgVFbWMudbljJfTNbHk0 +q/JncELcpdjE8DauPkNLF0qfhY2SOsjFFj4Xc+Mn9vU +-> ssh-ed25519 RJI3BA Qt9kDwlSVIsaCUXpH+YJtv+f/Q2V2Fkem0bYIF0AYWg +AZKBTt0NfAyR19sevT8XwEiP372/d227pAG5DKCjVNQ +-> ssh-ed25519 XnvJKw vwSKaB2v/NxzfDMNYO6qBsXtYKAhkUMbqZ3KQX2RKE0 +5MX1J2Pr/LCM4fCvYpSwQrPPFiGePPPyJFpwefmBmKY +-> ssh-ed25519 7NL5Ng lL0NRQgrP/DHZM9sprpSMfcGyDp8C743YiVVH21w5k8 +ymNxm5TFb6vA0M2e5RsKgmie9tDPzq8attLUp4oL3GU +-> 5g-grease V, {Bl : +KklStqygabEjsAWFS4uU6PkWeyfTcgvQhASRMW3cBLU +--- TamED7M5+txvj/Zokrm+AxvERTEbV24aoO+0OM1HZGg +pXLmP&Jɭuܬ]jDvNhQdj6~`C4!3TYw +f!3l@JDU1L \ No newline at end of file diff --git a/secrets/hedgedocSecret.age b/secrets/hedgedocSecret.age index a3c7a631..bb0de103 100644 Binary files a/secrets/hedgedocSecret.age and b/secrets/hedgedocSecret.age differ diff --git a/secrets/mailmoverConf.age b/secrets/mailmoverConf.age index 4188ee82..1382ca82 100644 Binary files a/secrets/mailmoverConf.age and b/secrets/mailmoverConf.age differ diff --git a/secrets/matrixSecrets.age b/secrets/matrixSecrets.age index 75b1e447..87e74358 100644 --- a/secrets/matrixSecrets.age +++ b/secrets/matrixSecrets.age @@ -1,17 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ yBLQvCqjIQA0q/Glv9FunViOneSc/5cOZ4L2ypejUUA -eXGBJJev6Sg8ots60v6WmWjmL5CdLIe+WZolG1KAAdM --> ssh-ed25519 ugHWWw j0Q/slfBhJkUn6ordv29nXvV8PZ+WZFssloOoctZw2E -01B8HjQIGj/PTvZQJoE4VWX5jJvLmRgRJQP8Ixzeppw --> ssh-ed25519 UU9RSA ax0Z9moz6KFZri7+SscwfWGL7oFFkv40ntABh3Mak0w -Mk0K25rpAPdNKsRVNeYoE9WRaijbodwsWIDNkQ2xfGw --> ssh-ed25519 RJI3BA mYzc7giL48yqCuB1EXsoUbR6OVeKn3/M8fXEu+PX/Qw -SuWnSNiDoTwBR4s9Uw95w2yzN8C/ksmFrPj6YYsX+zI --> T6l-grease z=1o C;#$J>xO Usu,q -MO4MzS0K5WAfD5kF01ngoRJF5b7k1svRZFi4bHDCBRAuddkXAodIlzNzvc7vGRHd -9ToYAz/NJUsZUkZq9HLEnL52gYwTGek6UdUirfQP9g4tpLozvVBewRJf4Mbsu+Cv -/Q ---- QPx8XT//3P3rmR3up98qVJJhRqme4+tYVhOxK+8l10U -槩'[ -BL~Ǜ?מ/# -,#{Z;RW6n<Rf'[%w8ɐtVOya9O\ \ No newline at end of file +-> ssh-ed25519 WceKOQ PZpqsiPP0eAtqMzhoJiLlC3NPYhgCFtaToTwLYFyElM +0jh7NvM6yfc+3eEeYSCfMeHriePTyrHtHCWlibivdVQ +-> ssh-ed25519 ugHWWw LvhQb/WBexTvHXI9rmA+CFvWSbl4xGzy/rEOlmHEZ3c +z/hwmTAOkwLpaPpgJd3p0mtJe2Wom0PMfyTytntGQf8 +-> ssh-ed25519 UU9RSA AzyqubJxscHujGeMVqbkb8pr8HxvX3FRulR8m7TSUBY +yJheWwb8BF+Qqt4lhM1e832TuaWcLWAfjQZaYySvGoE +-> ssh-ed25519 RJI3BA EbdDHWVStvnTbZ+fvJ5eITYimGSAtWEnVXXhGQsTaxw +bqVF3eLqwH+s9nQU5IntJLQZRkBHvblQ4dROH0NuDXk +-> ssh-ed25519 XnvJKw nWHvS5oMZYjN/oLQGF+nekm2qTsqcxcEOCH08TVCWC4 +djwmxtJvKSxwt2/agvyTpGJhSh5lSLsJBqa3KlVU6tA +-> ssh-ed25519 7NL5Ng OJQwQ0YBzIkhoA43ecNAGhCTbfP/8WceRn6m5wCrOVY +IhTOVrs43ndjWxnJzAcJrodRn/4nxDbHAX4IP3HO1HI +-> *)REB`n-grease KT?(=HN2 wW +jAF7/eKPOgdzo6RJ7QbLrT17Jg3KFU5UIHPno0YfXjdEUdUwfvyl3RyxwWjwqKfT +96P5pPwflDjfmOuIqaGts/ixVbsKD+gIGzUNxI1f7nqEoRy54kA0AGef +--- mYx1mSgmvCWSJH70IwfBj+a0+h3aGvfvMDcjFP1v/Ag +x/< (kH_(`c_v(>^=T2ǝ#u,`N/Qa힛D=@P  aS`%FE= \ No newline at end of file diff --git a/secrets/msmtprc.age b/secrets/msmtprc.age index 19079ad2..71096ea1 100644 Binary files a/secrets/msmtprc.age and b/secrets/msmtprc.age differ diff --git a/secrets/nextcloudAdminPass.age b/secrets/nextcloudAdminPass.age index d99bc29a..7f097089 100644 --- a/secrets/nextcloudAdminPass.age +++ b/secrets/nextcloudAdminPass.age @@ -1,14 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ ofXeR/h70Q97/ZaES9aSqozXB4KcxMXdzA7wqR1yqwU -38BAUTvTRIZfG922VkNFp7QmRmBvdjI1y6opFrji6vo --> ssh-ed25519 ugHWWw HO1aZyKKtQXhcQLw6qp78TjLpsaogQHyr/osaiywMCU -o/aKBz9ENEThTBOo3cxQ8cs9SlVcj7bxlQtgvk28mW4 --> ssh-ed25519 UU9RSA xiErZurwx3omwAsJ95YzNmRtufLRdux5eF+i1gsKxhg -WxqGVUui+jXl9QwzXCx5qou+4TX2vYpErAEf/oUZKkI --> ssh-ed25519 RJI3BA Yg7N2yedVv0NnvBkSkERUUaFBSGL8vW2192xoR9VYho -oOGIwCa6uMi3cc46R/rI6kZQwYqMAww6OW752KV+PwY --> '-J6YKco-grease -Upcjx4f7BzZSgtv51Q ---- 8Ug9an7EuVoyoCvKZ8hTqWjCT4UXfh869Dq+Q/dPUfc - ssh-ed25519 WceKOQ WNrjfPPHqVxsOFOKYIAbABKSYUoGWrZY88zFRP3W8Bo +4W+2qn/bEM+cVM+yW6QYt9eXbE49tjTvScjnLQqaCXE +-> ssh-ed25519 ugHWWw CR3qb7N1zIMlUlRIoQ8RZq0gtBlK42xvV92DUJHDbmM +1N7W4lavx+RO1rSy1ua7P9anjIAG7nBkM5lCXkrEaUI +-> ssh-ed25519 UU9RSA yvfGsp+cCYohcpUg4u9hhX5f0LpTc15Gw/fkHK+OQUw +u9+6lNqEx7VM2QpVIsGrLPUDL9z4HtNTNNCAgfZIcYM +-> ssh-ed25519 RJI3BA NsCbw0KGsZXu3zd/BfiMFKNCmU6eZAXiFvCV8LyqdlE +2iRAEboqFj2FgsHb/D+90jFH8xhHgB/1we2jLEbKGwA +-> ssh-ed25519 XnvJKw uBTqSoas3N4j+9FZdppDD0iIiZsHfCM0FIlr4PHtgw0 +PLBS4LryRdLAxQBycVng8/4jcw4RQ9OLgPJO4DT7pbM +-> ssh-ed25519 7NL5Ng lVagB0oqnP09m2D945QxRJohs+UpLFknQPIsNOEd4Fw +AOfuvSRgHojFhBvdPFlVllsGiIzYxy8d7daYpBu53a4 +-> v-grease n/Td l[ta N[76@tSl B<-`N4h +MADYe92LSLDE4N5nzVCap8ZrzqFxjO9QgVoDtFLf/b+w5WGpG0B7vc8WM2d1E1LF +b1n1jRon +--- 75Vl/c32WbryOo+P24hBai41deZio/KoPULVYlI+SvI +Qd%ј큟I܎YƵIOlО0 $+52\Yׁy \ No newline at end of file diff --git a/secrets/nextshot.age b/secrets/nextshot.age index 34380c05..dc2a8c28 100644 --- a/secrets/nextshot.age +++ b/secrets/nextshot.age @@ -1,13 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 ugHWWw ojqaEAsqnSOtqV91GINC/15JgwYaAiqIljsc0gHF7To -+LwOR4B4Od28RuHX9gPDlH1Q5GZsbmf3fEBzxT6ID9c --> ssh-ed25519 UU9RSA ReNS5W65pmz0Nholw4hpq5iFUm7lBpxHqNFGUbe1b1c -kqtzY5FpDyl4xLqb/OCT1o3N8Vd1hz1o2CtL55oYjZI --> ssh-ed25519 RJI3BA x5hgQEuH/RTMDBIbFH8Mc4f+Azda3mbmG6tjbGVuiw4 -FwP3Lmq5APH2NQsyOxejURnLM0jBxI3J7NsiSr68ZuI --> i3[\YKy+-grease I@OPK 33~Hh);+ -OrGATQuUao8JSBoaR6nbcJq6HHVoIUR47O2j7h2jJW8YkIaqok7LPp5G6ItTxPMm -3ODCXWWSy22DjGKPmgmKFbpXW9qsrUvp8b2R1XRVSFk ---- zOt2C1GegK/6fq2Z6Md6PPvtvQLQdeeB/t5BasC72jQ -_gPswWc-y>K 'j~9!9 CW~iƞZnöBq]]|Ui]n֎ӎ //d;܉ƫgy & :y -o݆gNv^˭,qEJlY |;G8 \ No newline at end of file +-> ssh-ed25519 ugHWWw fuuVO9R8GEyHFMdFhuok7gB3KNVc6meAaobc3ufGMyA +TzfYneHHExSL/oh9AWLI48adiJQYbW45FmPaaDQnZUI +-> ssh-ed25519 UU9RSA WSqlZqdNDAgRIu4UL5uvrm2goZbEhlVWbjHgW1qMugw +/OxGgZ+Wo7AB9d/T6pEYYC9SOCasMTb7h18brllGzDE +-> ssh-ed25519 RJI3BA zyxugSlGUv6irVMJHJwgHjHx4clk9AOw+Q49Sehh1D0 +U3F7HPHWiIP4aoKTnyFbcTP6xPFqByKnSUbatv0/VrE +-> ssh-ed25519 XnvJKw 6CKEktkQe4PAVQ8hy/osfoJ77IQCLRNgQw7ymVz+wW8 +pCOC69zmjo794lWW4Y6MQrG3A1cj86Z884LHiRxiBD4 +-> ssh-ed25519 7NL5Ng pdvHOUcBrLRAq34VuEg/YW26yQK4RiTiMTtv0vdYXRs +0ZPm0I4Z/mc9Q8Vr3wvLZ+Iar31hRXF4b0GlKOuk7Mo +-> HI{_h2C-grease +P2wm9NJE7ZaIE4BpIOiG6FPqm7y5cr+UHzdmANUhIdk01GejQAeSyXCeZHgIYv6f +jd7jB27r8gBZFOTF +--- CuOZgU+7toBwbA0cQ+TyLo3Pr+PyDMKSDnITX4RIHVo +:@)1:-u.P,$wZne~ǎ8õsruH-Ϡt ?*ijD`Vtf}Isg8VC vu~kXZ׷a8V@Ԩ|gt׳E>iº[}But3CNDN FLl+8̉ \ No newline at end of file diff --git a/secrets/paperlessAdminPW.age b/secrets/paperlessAdminPW.age index b3ff91ae..2e7f5019 100644 --- a/secrets/paperlessAdminPW.age +++ b/secrets/paperlessAdminPW.age @@ -1,13 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 IbXxfw flY55GVc+5gTGtNCmA4QTL1DZ6w8LNmHCBI8DNeyIGE -ncTwV8OS12G1nUbxW2nSI7bhuf91q9QcUF/ZQZXLTGs --> ssh-ed25519 ugHWWw hUvOdu87y2+7QGV9Kx6YjwZlofaERU05DmjN3zv/ZwY -riCqvpo0Uc/v8ompL14ENBkxsWbPFJTu6Fid5J76qbc --> ssh-ed25519 UU9RSA 6FXp6sXqg+5osDjmZOi5wTmu9n+yMAiIjep8SbmzJWo -+azebeSNM4B+xsCNdGkt2omnPZXWDoPYdragTWky0rc --> ssh-ed25519 RJI3BA 1wwP58dEl8xYdbsHS0ZjFGYZuivowryVdOWIXJsi40M -Fdcq1FHtEWrG36ucnik80sgwI8B/bcdUmjHLQlyLqeo --> xf-grease e+ jDj`R Mu (G,2 -UFF1bXvGwOIE2fv0bd7HfTmRKzdo6w7mCVTg6teITcVjdGxQmrYdyw ---- ruQKbeYtNcXn28Xef/dwKjdOVDAEkNQNrzM6h+KYG4Q -韔M(}(Q*Ĥ0ںd>G6U=i i ]_kHI)pjWs \ No newline at end of file +-> ssh-ed25519 IbXxfw 0mxQAH2SI8aCHZxF+GvpwYkv9DrMgC6bBHyTzvRNxyM +MhItp2OgKz72dBTmea4WdBlzQBXRJ6acZGenjrY/Lrs +-> ssh-ed25519 ugHWWw dqxAzClvOdnZ5q7p8YGDWzr83wdixr51RP/529o8Zk4 +oQrartbNeBslsxnUT1xdeTK8qMDyhHj5VyspOhKS6ME +-> ssh-ed25519 UU9RSA geoYVEk0uw3JQkM6Ak/d5rhtWeV8cecH8wXXTECIrFY +rGYV0K01gcLBP+PlZ/TAntogTDN9aU3oGUEkTj1XJYU +-> ssh-ed25519 RJI3BA ZRb4EizXiVf7EvWzWkvAtPu2BrZbOmmVoGrB+hKdQlE +5/6o0R4nvwhSZwM5JSLC202OW9gvaSr30SDtRnSu2Nw +-> ssh-ed25519 XnvJKw Efj2YGr9mvyBgathl2Sf1UrdtJtSo4VuxlHDns27Owc +Y1zWxuLSs0xOEm9yWIkEV5J5avAHf/+XuBLvi3tcqM0 +-> ssh-ed25519 7NL5Ng 7tSEh0EqrIInLHNFYQOTsZ8ox92HLzXovRT9xThYcDg +zThnDjx0z5q5U6RBe91q1OVbIWZaWkeJ6kMFOZ2QiqE +-> T2_eKt#@-grease Sk?+ 3,Sw_ G&>Zh +uCY+RD6ABCLg3hx8vA +--- nj1d2n33GmzBsoN975TJyxcHUlS9XP9/mLDWZjgpl+4 +ze'ߝsѵůGJL H6ɰ4΢a#lZ \ No newline at end of file diff --git a/secrets/photoprismEnv.age b/secrets/photoprismEnv.age index 1d976ddf..c60d511f 100644 Binary files a/secrets/photoprismEnv.age and b/secrets/photoprismEnv.age differ diff --git a/secrets/picardResticHealthCheckUrl.age b/secrets/picardResticHealthCheckUrl.age index 023a6b2e..428ac2ef 100644 --- a/secrets/picardResticHealthCheckUrl.age +++ b/secrets/picardResticHealthCheckUrl.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ FLnoAcRst2UMzIsBapoG2jVwt3CxX2laHMLCRX9Q7Gc -9KtsuTxlQnsxzBr1yUpDWLlKtm8q9fatOrNbePhMieA --> ssh-ed25519 ugHWWw 243opN+v72OEsOgdYqzZySU3uEB/UHh5gYCo6gAOtlY -7IicwTKyDDwSLaZ/kqu2DBmJyn2ip1amGt5vEOuMizM --> ssh-ed25519 UU9RSA 9VSN1u2zKE1KL4tXLRS+ouoqkXDdRSE8nC4mM+nLP3I -fK4eGYWesaAQSnQyjlt46dmkJlU2FpAL7ildRujLqn8 --> ssh-ed25519 RJI3BA wnJs5EfZBp66tNdgx9Y25d4lAb+RVIoYdiIsQlpRfwg -4ASJcNoPBuvtCDm6NOeNihhtOp43mELbyXBsKSKjMuU --> Ss~qy=$*-grease A20YZ?J N!xR-r ]|Ava<> -vWdAXn5cqDHxDb+0oZhJtQ7ZG+QxiqwW/gKY7cVJ ---- nghcbQbqWA2VlM+0jsIqBmQthsjuv9+1gQcekjZHHPc -mD~DИ?!m̓r^aԷjOҤezdhިFzr^KWyٽ?AI̊3X/_DA[ \ No newline at end of file +-> ssh-ed25519 WceKOQ j4FqmUgLh9O2K6LBGySqKAbUeHo4HrNVXdXlMVu0bkE +iS8Bkja76E29wh/p2bi6JTNGEthXp08y9JgXgksiaZA +-> ssh-ed25519 ugHWWw aG22fYnmL/HRhW9+mMg3SloWmUZ8eNxnIFOKGmweLjA +D5WeFHtEXZ1p93eXVLcfVgny+AuGROVIO9/P63JSyIc +-> ssh-ed25519 UU9RSA HGB8L8tu7uqGte0oVVdsDDfdQVLQUZSqWk0RVYa5Ghk +X9MguddTeUtUMFWebZsWjiFqs4+CjZJefX3a1zzXrQk +-> ssh-ed25519 RJI3BA oqRmZvP1tJ1twWTRj0E5nS/44vHTX7G1Ei2EiKSKFS4 +j7GOaqCQKI2TAj1jC7GGH+0epcwznFnPeZdP91cgFuU +-> ssh-ed25519 XnvJKw 3O22L1hn+So9AGAS4g1JavUqzDiSUp+BFo5bwMPQmwU +tZwa5UgwGsV0wLrC0Qqdto/zcyHUABTp+CgFqNbO9vY +-> ssh-ed25519 7NL5Ng x7fKB1BHn/jHMU8mBpuKPaV1MSXLvNEZIwfuztGl7AQ +mzBgzHLG7MjSXryGmpf7jumwpkaKkiOicsA4CPlKBUo +-> dH-grease +zK4lKWoddMZPXbRma95rYom3koLGx0LZCI7+TGM3PFOXU3zrC8vSZ1uJNuBf3A1i +K1nj0Rj2DK5VFDYRFSx+ +--- /vm6XGMjTs1lpRSZKICqqUm7E1k5Gn5B+/Ga69cvME0 +~xtpD#@6t{xK;95 JqC)Ӷs0=J]oQ!!eӗ[*I*΄Wj \ No newline at end of file diff --git a/secrets/picardResticPassword.age b/secrets/picardResticPassword.age index cf7e3f88..39e0b597 100644 --- a/secrets/picardResticPassword.age +++ b/secrets/picardResticPassword.age @@ -1,13 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 WceKOQ 7As5oxIfq9FfRzrCj5q0VpO+PhcRzPyTFrjqbaO7zG8 -XAUVqPtaMAEtvBfte5L5mNrdbEN8S4jj1kOkf3fDFcE --> ssh-ed25519 ugHWWw U6XyGWO6OfV+2zf/dgMVVVkWnRGYl8kB5sXCn4jR9Gs -avWsiPRwkvWFDLYeTLm+M7fhSpP6sdCOxq4AOD1dm/c --> ssh-ed25519 UU9RSA +NCKHl7f4L6FQGl5vKTX9AFEbCG6K19DFJSxy0g8/z4 -yMql8nRtJkpreuZuJfqihHWwBVaRfuMTBAzXeA+oy9o --> ssh-ed25519 RJI3BA 5kOFp1C7lSMhla05+WJn8VnFk3BqSWhx9q9IG9f0mGc -FtN4NxUSU1gz+LoSrGp3ezoXr0Fu1dfJg9yhrO/p7QE --> gAT7IVf-grease 2m}Fb[ _hsN -qaTH1Vbg8+WRKf/SJA0 ---- J0vqUPn057VaFKkqc1Awa8fKSm70a/dm525lL2uKhec - ~@}^ƼQxWaWa v¦ksK$Y6k*x>x!grb<1]Bty(H \ No newline at end of file +-> ssh-ed25519 WceKOQ bKjAHdUMBJfl81VtL1gqHOPR8nwYnPRc5q3pINjp61g +ALHl+ASDv9rUfhQ1bJay9SWjyzQD8IDqwuouCFBVOyI +-> ssh-ed25519 ugHWWw Ofa13KdIztrDg2UlFYomokV3K6ZhAdZZDqb9CtccB08 +gF10wsVpiiCiiiw7H34TXY/urbBEDF40Zk4T1qZxKUo +-> ssh-ed25519 UU9RSA UFwhHh3XC0Zfmcp+z9YmoNhcNjvzag+KPuX85srWTEI +Kirt+WJ330Ik1SN4L8v88Z5DbpqOOb/5kQ8iqq34eEA +-> ssh-ed25519 RJI3BA Zx+OvRnucdGk9NMA4u0clsnUhI5yohn2ETee69gBpFM +oX+g2WPZ3aVEZdYT1JtCDeyAB3UPQaagrviyY1cfFfM +-> ssh-ed25519 XnvJKw aXL+uc2LKAkgCGtTc/x9pNDzgXGlVI6vZ3aZ/J4Hlz0 +p8CucmnRe5lrzWXB5WQggu1PBmspaWLuZNOpxE1p3Tw +-> ssh-ed25519 7NL5Ng Xgf90XI/iderQQXIUNU8O0Ez6H+hS0V/3g57o/TxWGU +lYwbL9mO/0nEOyl70YZDAti0U42tEsQd51xK5EkDBOo +-> hJqQ{-grease +XJ9VbYKelSZvthGtgebl3o/7IjH2FPIf +--- FpjxWeA4Earhs0Av9Q2V7j6CmYKGYeXhcDg8H+TdJqA +uCl?ށT,%~}gvDüϏ=reFyj: =,&4AFhrguLfÒ \ No newline at end of file diff --git a/secrets/picardResticSSHKey.age b/secrets/picardResticSSHKey.age index 19e34b25..80e156e6 100644 Binary files a/secrets/picardResticSSHKey.age and b/secrets/picardResticSSHKey.age differ diff --git a/secrets/prometheusBlackboxConfig.age b/secrets/prometheusBlackboxConfig.age index b0f77bc9..4887ccfe 100644 --- a/secrets/prometheusBlackboxConfig.age +++ b/secrets/prometheusBlackboxConfig.age @@ -1,18 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 46dvqg YDxtUSg3QOM3qbqxYuKO1ga4JOAumKpcuf9GlBd0Nn8 -d5tNS2c0LSqFXEzz1So4DG7ymdsjFf3fL0NmvUwMghw --> ssh-ed25519 ugHWWw SOIF3aWQ0PWJqz7z5Ah4EtjXxAzfN4FwACEqXtqBrWY -+VEK3cDwW3lZiI+09jr4M1Kzf76klZgrcqr5qYtLtR4 --> ssh-ed25519 UU9RSA y3sYSGTO+DC7btlBd9+KwIjzX9TjzPXPU39kH12f11E -IppTK0GKRPQ3CKAjqXoweb4n8N7IXSOpZjhgiBe+VUU --> ssh-ed25519 RJI3BA d1Qw2K7LTibTh8+Zaha9ynmNk1xgDlXfDeF/vHPd2FM -indJ1NRruWxnhg3NtlkdhxkDCDGF4ghSyDgkTCBFDvU --> ssh-ed25519 XnvJKw xsGYu6HUfUgkb93mhgDHNYJ+8dZZJpqFRAg1c32luUE -p9gDrwX9jvnuP+QRjqpLJp2qMpti5Oa+8dUIjMBZqrA --> ssh-ed25519 7NL5Ng fiu2K+E1F/6A5WBHeAgEM40dbDUvqskOaxrJfOmCSlQ -nBVY0IZ10hatoxWQQkYatcxzYrU3Zn0z/o9tJia9ooI --> ;\&a?k}-grease 2Xc0a 8J&H^ hR>D -EEyqIPv7t8ElVB/DilVhYGEDY1Jn5mrxVvmuUCPO3kPWJUdJCNAVv9uJPAN3/k0e -eP/qCcMJq5Y+W5hkAhH7SFk ---- XmJJ95cSiIMh9vOsct53Ix0d19Gwbl0aQYU+i5MNysA -4iCQqeCQ2mVT, ָ \ No newline at end of file +-> ssh-ed25519 ILWjJw +E30S5Dn6Azu/dB0FfRgsNjw1gXTkHLqWcf79WBqyG0 +kFyzZ9uthoe5E4/Ric9gNpPd8ghQNrQ0yAFx8ivRfxw +-> ssh-ed25519 ugHWWw ie0ECsCY/N6TKgLmcWb9SuMVX9Bn4/9OhEp2a8uIRDg +NUVeKXFZMXzA/gQ0R63pYxSi0Uf8vKmyMn8rH37Jt+k +-> ssh-ed25519 UU9RSA F9ZPD2WGY395qB0DH6Cfr3S3z43swBhPzR+bNSmsMTE +BSoq/9u3b3jtg5eHNi35fA0HQ3kHL1eMq6w8dty0Y2k +-> ssh-ed25519 RJI3BA J26x1AEL3PNOi6E27FHUOYi+OmPM9nR3HAC4b4z9HWQ +8AI7Twz+8npwiaw2yUCBiG0Bvr8JcRjWsORisZ1EOg0 +-> ssh-ed25519 XnvJKw Gz+eZcaaVgQvq/VAraC4ZvgNCE6PYQmrcArQnsvGZyY +c8eYSvLy5JsDeIqcQmEdqbr6safk+vIO8N2VculqV7Y +-> ssh-ed25519 7NL5Ng XBeQ2z2nA1GwFnjY0BvdrDPfsYBIjTN9wTeS887Bp0k +ylHNPZ3+3ByldVlg1YX+MFeUv48D9zzm0mcWBirck8U +-> m/&*kj-grease +'B -# 7N +ug3p@F +uSA0sJfDnofNdwk +--- b6jmnjknCpOggh3RyGFU+z/roirI1ZgbbECG5TSA9V4 +C_TApvF*^IL;v۶<9 \ No newline at end of file diff --git a/secrets/pulseLaunch.age b/secrets/pulseLaunch.age index 061e4836..444b6fec 100644 Binary files a/secrets/pulseLaunch.age and b/secrets/pulseLaunch.age differ diff --git a/secrets/ragonPasswd.age b/secrets/ragonPasswd.age index d7ae1ac2..a97e329d 100644 Binary files a/secrets/ragonPasswd.age and b/secrets/ragonPasswd.age differ diff --git a/secrets/rootPasswd.age b/secrets/rootPasswd.age index 97667246..4c2a2de4 100644 --- a/secrets/rootPasswd.age +++ b/secrets/rootPasswd.age @@ -1,20 +1,27 @@ age-encryption.org/v1 --> ssh-ed25519 ugHWWw 4p+B9y6wXOJfVJwD2XEw1tyCNzaSyM6+CV7TFq7cdDk -Ayj9e+7slBoZxhNtyA4UBdy2OS+lRcjsUcBQeK7fytQ --> ssh-ed25519 UU9RSA Jc9jphsOFHEbbk16qrIroYB38CfnxS7S5Prt/grSpwI -/xwbSkWh0wM8xAIcGPYryEbFOBhGfgs4UVP5uJvNfr8 --> ssh-ed25519 RJI3BA CCR8yhArRNhOrBWNOPHsaVmg5Gp44xZZOCl0BL4yMy0 -beIN4dcrVWXNImaTi62oYyOnwRFqioIUr6Hj1ZgAo90 --> ssh-ed25519 R/VstQ iRe59WizoGfDgVRif4YZ1/M8kC6623iAx1r3ZYIoPkA -onEwCoydnLRnBv6WyE5qyWicJ6+IpOHgRU4LYU9uWq0 --> ssh-ed25519 IbXxfw XKQ5/q2HpQ6fvd6Wqq6lyvKZmvV1aXumw9dvu/h8wFQ -Gc2/lF6kKrmJVfekOtH+WSs9QxPMSZ5ToYg1IoQLUZA --> ssh-ed25519 46dvqg md2KiKF+Ag4muG7425gUP3LyCKHoSR7X3bVsA4+zfmc -hCvMC7UvaOUBSDMH+jjmqvJEfchKVaT6HCjYAq8UxWM --> ssh-ed25519 WceKOQ q/59YeeFxSYTBqQY7bS6v06WhM7ijttX/VmR4wDzqHk -pUNGZ3RLGFDlK2LWuV10wlsShNngEcAQ2Azk5ooSM7Y --> #bmj-grease I$ Fx g=:*3 Q?EqzhQ -JU7ywobTCZL/UEfQOgB1UXj52hCn1LM3eUfv/S5LxLWAq+H8LD+exMHVYFeYz7s9 -d/K0bnjyAZrlK3dG+C6cHWIlVKj8Y1debxEJphtbmD00glb60hSRphtJxTNp ---- heTbYeedM7bEZ6pYyv+zTFG5P9XnbP/3kKukdwNFoQc -7S1$BpQ0YZ(.0?SѨF+p,G% hd3#2䘍P7WW_u Wo-3w0}c"quR?* M7y!ظ * \ No newline at end of file +-> ssh-ed25519 ugHWWw FcfKvV1RuTOfFQUv8nYJ1UH2nAhCjljTp31fgMc0jzM +xDyBgIw1dVklzmutyqWE5v9K5JP98OZ2FhJ1dQ5cYEo +-> ssh-ed25519 UU9RSA JuzqLYoXI4j5Ay8R9eVpyB2/951NcLvu1K1L5j4xEno +w7t1CFsBNjOJkUI6EdAb/Dex7VQgYgA9dIKUttOVUoM +-> ssh-ed25519 RJI3BA TKrrnIlEzf4ScBtG1qhDfrsTLLlHBeZgQNOfFXGQ11o +uarSQefOfANkLSI86Kq/P51FieS7V2OIRHQf6XeuWXg +-> ssh-ed25519 XnvJKw Wcp8cPdX6IqqgXT5oIxKTmOUe0bDw2x/tpiiHrBUj0Q +YGCRMCIL2GmYSx6Z1cmsN8SxUzSt4lcTqCYjDYfFowo +-> ssh-ed25519 7NL5Ng sTjrO+94YvQfmELsXaKxw+a2yOSG0r+P12gZmcgfBXg +ShrmcVdGp3fkWvLeGJdzmxuPoCGXh6mcbOQMpvGHmPo +-> ssh-ed25519 ILWjJw 8S6uP16ruWQ0429x1Zk7apEWy4oat/FzsSsTPhc7QT8 +ribE/Ha0Ui2niNX17/ulSPt0AIg0ROKuSRuMIqW49vI +-> ssh-ed25519 R/VstQ WAlcinLBvuY+Z/LqZxwjbn3/F4TRBPckjGEUsUyxISU +MUg9OrDVTZCve6atpqC1sDzS7jM2Un4gq0652RkpTCM +-> ssh-ed25519 IbXxfw CTR+qp1R0S3DjeGmFyEDsbovqkuW4WLDLc3phNAePG0 +S2d9F8HZu5rVzNSctuQ9TtQRWdauXis+c98Ea1XL2Vs +-> ssh-ed25519 46dvqg FzvYtQGe2gca+2CYaH3K2jGI1M/DWL+5h5Ei2amy8wI +ULQ3ROxNW+Htz9/djVfgexJFUnOjk6+W1LJ/yJnJ4ps +-> ssh-ed25519 WceKOQ dWkI4tRN8gvee/VJiYcrC7mcDD/M2vB2HGge+os7REM +qvR4VGYpUL817+dV541gJNZAZyOTlYng7Tpdc1qGY88 +-> B|2y[a(-grease R8(Ldm v%qHti +ddflABuI/XVh53tJfDvoH7n8mnlS7rbJ2BRkgo70AxIVgJFfWxI7tjRcoV+mWbV+ +iGYDv6Llb/kQkJC50rKUdULNutgEDiW0nShkbQpBKXnhvva/xo4iBw +--- /f9YBZzUs0dPpsfYxnM/7fRuUCSAvydcI2fMMbPoh8w +B*$sp3Edm5N\_&W"FҪ~l3 +%kE%EsڨqH,[ ͸=eGو<_r?8w9_S[m p%Xlo \ No newline at end of file diff --git a/secrets/tailscaleKey.age b/secrets/tailscaleKey.age index c261a879..1e73d783 100644 Binary files a/secrets/tailscaleKey.age and b/secrets/tailscaleKey.age differ diff --git a/secrets/wpa_supplicant.age b/secrets/wpa_supplicant.age index 9ba59a00..05065afa 100644 Binary files a/secrets/wpa_supplicant.age and b/secrets/wpa_supplicant.age differ