From 0614d7ff0402a4063314f7cfc358dd7d9ee0485c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 23 May 2026 15:11:25 -0400 Subject: [PATCH] initial work on dns resolver + openwrt mgmt --- .gitignore | 3 + bin/skyg | 5 + flake.nix | 15 +++ hosts/fwbook.nix | 1 + hosts/hl-fwdesk.nix | 3 + hosts/hl-fws1.nix | 5 + hosts/hl-minipc1.nix | 5 + hosts/hl-minipc2.nix | 5 + hosts/hl-minipc3.nix | 5 + hosts/hl-terra1.nix | 5 + modules/lib.nix | 2 + modules/nixos/server/default.nix | 1 + modules/nixos/server/dns/default.nix | 88 +++++++++++++++ modules/openwrt/default.nix | 66 +++++++++++ modules/openwrt/generator/Cargo.lock | 107 ++++++++++++++++++ modules/openwrt/generator/Cargo.toml | 12 ++ modules/openwrt/generator/src/main.rs | 155 ++++++++++++++++++++++++++ openwrt-routers/glmain.nix | 8 ++ secrets.nix | 16 ++- secrets/.gitkeep | 0 secrets/dns-addresses.conf.age | Bin 0 -> 1323 bytes secrets/glmain.json.age | Bin 0 -> 5935 bytes 22 files changed, 505 insertions(+), 2 deletions(-) create mode 100644 modules/nixos/server/dns/default.nix create mode 100644 modules/openwrt/default.nix create mode 100644 modules/openwrt/generator/Cargo.lock create mode 100644 modules/openwrt/generator/Cargo.toml create mode 100644 modules/openwrt/generator/src/main.rs create mode 100644 openwrt-routers/glmain.nix create mode 100644 secrets/.gitkeep create mode 100644 secrets/dns-addresses.conf.age create mode 100644 secrets/glmain.json.age diff --git a/.gitignore b/.gitignore index 5a62bfa..f37cf6a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ diffs .locks result.diff .tmp + +# Rust build artifacts +modules/openwrt/generator/target diff --git a/bin/skyg b/bin/skyg index 587d465..6e394a5 100755 --- a/bin/skyg +++ b/bin/skyg @@ -88,6 +88,11 @@ def "main remote" [cmd:string, target:string = ""] { bash -c $runcmd } +# Deploy OpenWrt router configuration +def "main openwrt" [router: string = "glmain"] { + bash -c $"nix run .#openwrt-($router)" +} + # Build ISO image def "main build-iso" [] { nix build .#nixosConfigurations.iso.config.system.build.isoImage diff --git a/flake.nix b/flake.nix index d5b8bc3..6b424c6 100644 --- a/flake.nix +++ b/flake.nix @@ -126,6 +126,9 @@ nh agenix.packages.${system}.default home-manager.packages.${system}.home-manager + rustc + cargo + rust-analyzer ]; shellHook = '' export PATH=$PATH:$(pwd)/bin @@ -137,6 +140,18 @@ lib = lib; formatter = lib.eachSystem (system: nixpkgs.legacyPackages.${system}.nixpkgs-fmt); + # OpenWrt router management + # ------------- + packages = lib.eachSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + openwrt = import ./modules/openwrt { inherit pkgs; inherit (nixpkgs) lib; }; + in + { + openwrt-glmain = (openwrt (import ./modules/openwrt/glmain.nix)).deployScript; + } + ); + # Non-NixOS Linux Setups (standalone home-manager) # ------------- homeConfigurations = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 4412075..d411e98 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -219,6 +219,7 @@ in ]); services.usbmuxd.enable = true; services.flatpak.packages = [ + "org.chromium.Chromium" "io.github.kolunmi.Bazaar" "com.spotify.Client" "com.cassidyjames.butler" diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 026672d..60c6e15 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -193,4 +193,7 @@ in "default-runtime" = "runc"; }; }; + services.flatpak.packages = [ + "org.chromium.Chromium" + ]; } diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 6e4365a..6567d4c 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -2,6 +2,11 @@ { skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.server.dns = { + enable = true; + openFirewall = true; + addressesSecretName = "dns-addresses.conf"; + }; skyg.nixos.server.k3s.enable = true; skyg.server.admin.enable = true; skyg.networkDrives = { diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index f36973b..50ff0c6 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -24,6 +24,11 @@ in { skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.server.dns = { + enable = true; + openFirewall = true; + addressesSecretName = "dns-addresses.conf"; + }; skyg.nixos.common.containers.openMetricsPort = true; skyg.server.admin.enable = true; skyg.server.exporters.enable = true; diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index f90c28e..384f021 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -2,6 +2,11 @@ { skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.server.dns = { + enable = true; + openFirewall = true; + addressesSecretName = "dns-addresses.conf"; + }; skyg.nixos.common.containers.openMetricsPort = true; skyg.server.exporters.enable = true; skyg.networkDrives = { diff --git a/hosts/hl-minipc3.nix b/hosts/hl-minipc3.nix index 41b6465..3bfb71c 100644 --- a/hosts/hl-minipc3.nix +++ b/hosts/hl-minipc3.nix @@ -3,6 +3,11 @@ { skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.server.dns = { + enable = true; + openFirewall = true; + addressesSecretName = "dns-addresses.conf"; + }; skyg.nixos.common.containers.openMetricsPort = true; skyg.server.exporters.enable = true; skyg.nixos.server.k3s = { diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 96eb890..7d2730e 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -17,6 +17,11 @@ in { skyg.user.enable = true; skyg.nixos.common.ssh-server.enable = true; + skyg.server.dns = { + enable = true; + openFirewall = true; + addressesSecretName = "dns-addresses.conf"; + }; skyg.nixos.desktop.enable = false; skyg.server.admin.enable = true; skyg.server.exporters.enable = true; diff --git a/modules/lib.nix b/modules/lib.nix index 3c9b683..e47520c 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -7,6 +7,7 @@ , systems , nix-flatpak , stylix +, agenix , specialArgs }: let @@ -26,6 +27,7 @@ let stylix.nixosModules.stylix home-manager.nixosModules.default nix-flatpak.nixosModules.nix-flatpak + agenix.nixosModules.default specialArgs.dms.nixosModules.dank-material-shell specialArgs.dms.nixosModules.greeter specialArgs.nix-index-database.nixosModules.nix-index diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 6802fd3..18f4591 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -8,5 +8,6 @@ ./k3s ./services ./timers.nix + ./dns ]; } diff --git a/modules/nixos/server/dns/default.nix b/modules/nixos/server/dns/default.nix new file mode 100644 index 0000000..53996a5 --- /dev/null +++ b/modules/nixos/server/dns/default.nix @@ -0,0 +1,88 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.skyg.server.dns; + + # Each { domain, ip } generates both exact and wildcard dnsmasq address entries + addressEntries = concatMap + ({ domain, ip }: [ + "/${domain}/${ip}" + "/.${domain}/${ip}" + ]) + cfg.addresses; +in +{ + options = { + skyg.server.dns = { + enable = mkEnableOption "local DNS resolver via dnsmasq"; + + addresses = mkOption { + description = "Static domain-to-IP mappings. Each entry generates both exact and wildcard dnsmasq address= entries."; + type = types.listOf (types.submodule { + options = { + domain = mkOption { type = types.str; }; + ip = mkOption { type = types.str; }; + }; + }); + default = [ ]; + }; + + addressesSecretName = mkOption { + description = '' + Name of an agenix secret whose decrypted content is a dnsmasq config + fragment (address= lines). Included via dnsmasq conf-file. Set null to skip. + ''; + type = types.nullOr types.str; + default = null; + example = "dns-addresses.conf"; + }; + + upstreamServers = mkOption { + description = "Upstream DNS servers to forward unresolved queries to."; + type = types.listOf types.str; + default = [ "1.1.1.1" "1.0.0.1" ]; + }; + + listenAddresses = mkOption { + description = "IPs to bind. Empty list means listen on all interfaces (dnsmasq default)."; + type = types.listOf types.str; + default = [ ]; + }; + + openFirewall = mkOption { + description = "Open port 53 UDP/TCP in the firewall."; + type = types.bool; + default = false; + }; + }; + }; + + config = mkIf cfg.enable { + age.secrets = mkIf (cfg.addressesSecretName != null) { + ${cfg.addressesSecretName} = { + file = ../../../../secrets + "/${cfg.addressesSecretName}.age"; + }; + }; + + services.dnsmasq = { + enable = true; + settings = { + address = addressEntries; + server = cfg.upstreamServers; + } + // optionalAttrs (cfg.listenAddresses != [ ]) { + listen-address = cfg.listenAddresses; + } + // optionalAttrs (cfg.addressesSecretName != null) { + conf-file = config.age.secrets.${cfg.addressesSecretName}.path; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedUDPPorts = [ 53 ]; + allowedTCPPorts = [ 53 ]; + }; + }; +} diff --git a/modules/openwrt/default.nix b/modules/openwrt/default.nix new file mode 100644 index 0000000..91175d5 --- /dev/null +++ b/modules/openwrt/default.nix @@ -0,0 +1,66 @@ +{ pkgs, lib }: + +let + generator = pkgs.rustPlatform.buildRustPackage { + pname = "openwrt-gen"; + version = "0.1.0"; + src = ./generator; + cargoLock.lockFile = ./generator/Cargo.lock; + }; +in +config: + +let + # Config JSON is read from stdin at deploy time — caller decrypts the age secret. + # Usage: age -d secrets/glmain.json.age | openwrt-deploy + deployScript = pkgs.writeShellScriptBin "openwrt-deploy" '' + set -euo pipefail + ROUTER="${config.router.ip}" + ROUTER_USER="${config.router.user}" + SERVER="$ROUTER_USER@$ROUTER" + + CONFIG=$(cat) + + DNSMASQ=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen dnsmasq) + ETHERS=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen ethers) + + echo "Fetching current config from $SERVER..." + CURRENT_DNSMASQ=$(ssh "$SERVER" 'cat /etc/dnsmasq.conf' 2>/dev/null || echo "") + CURRENT_ETHERS=$(ssh "$SERVER" 'cat /etc/ethers' 2>/dev/null || echo "") + + echo "" + echo "$DNSMASQ" + echo "=== dnsmasq.conf diff ===" + ${pkgs.diffutils}/bin/diff --color=always <(echo "$CURRENT_DNSMASQ") <(echo "$DNSMASQ") || true + echo "" + read -p "Looks good? [y/N] " -n 1 -r < /dev/tty; echo + [[ $REPLY =~ ^[Yy]$ ]] || exit 1 + + echo "$ETHERS" + echo "=== ethers diff ===" + ${pkgs.diffutils}/bin/diff --color=always <(echo "$CURRENT_ETHERS") <(echo "$ETHERS") || true + echo "" + + read -p "Deploy to $SERVER? [y/N] " -n 1 -r < /dev/tty; echo + [[ $REPLY =~ ^[Yy]$ ]] || exit 1 + + echo "$DNSMASQ" | ssh "$SERVER" 'cat > /tmp/dnsmasq.new.conf' + echo "$ETHERS" | ssh "$SERVER" 'cat > /etc/ethers' + + ssh "$SERVER" ' + cp /etc/dnsmasq.conf /tmp/dnsmasq.old.conf + cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf + if dnsmasq --test; then + /etc/init.d/dnsmasq restart + echo "Done" + else + echo "Config invalid, reverting..." + cp /tmp/dnsmasq.old.conf /etc/dnsmasq.conf + exit 1 + fi + ' + ''; +in +{ + inherit deployScript; +} diff --git a/modules/openwrt/generator/Cargo.lock b/modules/openwrt/generator/Cargo.lock new file mode 100644 index 0000000..a2fdfa1 --- /dev/null +++ b/modules/openwrt/generator/Cargo.lock @@ -0,0 +1,107 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "itoa" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "memchr" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" + +[[package]] +name = "openwrt-gen" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "proc-macro2" +version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "syn" +version = "2.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/modules/openwrt/generator/Cargo.toml b/modules/openwrt/generator/Cargo.toml new file mode 100644 index 0000000..a7a128d --- /dev/null +++ b/modules/openwrt/generator/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "openwrt-gen" +version = "0.1.0" +edition = "2021" + +[[bin]] +name = "openwrt-gen" +path = "src/main.rs" + +[dependencies] +serde = { version = "1", features = ["derive"] } +serde_json = "1" diff --git a/modules/openwrt/generator/src/main.rs b/modules/openwrt/generator/src/main.rs new file mode 100644 index 0000000..2d26a67 --- /dev/null +++ b/modules/openwrt/generator/src/main.rs @@ -0,0 +1,155 @@ +use serde::Deserialize; +use std::collections::BTreeMap; +use std::io::{self, Read}; + +const ROOT_DOMAIN: &str = "internal"; + +static IP_PREFIXES: &[(&str, &str)] = &[ + ("lab", "10.0.10."), + ("k3s", "10.0.11."), + ("hub", "10.0.12."), + ("cam", "10.0.13."), + ("iot", "10.0.14."), + ("apl", "10.0.15."), + ("router", "10.0.16."), + ("devices", "10.0.0."), +]; + +// Networks where justMac defaults to true +static JUST_MAC_NETWORKS: &[&str] = &["devices"]; + +#[derive(Deserialize)] +struct Config { + #[serde(rename = "generalMappings")] + general_mappings: Vec, + networks: BTreeMap>, +} + +#[derive(Deserialize)] +struct GeneralMapping { + ip: String, + domains: Vec, +} + +#[derive(Deserialize)] +struct Device { + mac: String, + name: String, + #[serde(default)] + id: Option, + #[serde(default)] + domains: Option>, + #[serde(rename = "justMac", default)] + just_mac: bool, +} + +struct ProcessedDevice<'a> { + device: &'a Device, + ip: String, + host: String, + just_mac: bool, +} + +fn prefix_for(network: &str) -> &'static str { + IP_PREFIXES + .iter() + .find(|(n, _)| *n == network) + .map(|(_, p)| *p) + .unwrap_or("10.0.0.") +} + +fn process_network<'a>(network: &str, devices: &'a [Device]) -> Vec> { + let prefix = prefix_for(network); + let just_mac_default = JUST_MAC_NETWORKS.contains(&network); + let mut suffix: u32 = 0; + let mut seen: Vec = Vec::new(); + let mut result = Vec::new(); + + for device in devices { + let base = device.id.unwrap_or(suffix + 1); + // Skip any already-used suffixes + let next = (base..).find(|s| !seen.contains(s)).unwrap(); + suffix = next; + seen.push(next); + + result.push(ProcessedDevice { + device, + ip: format!("{}{}", prefix, next), + host: format!("{}.{}.{}", device.name, network, ROOT_DOMAIN), + just_mac: device.just_mac || just_mac_default, + }); + } + + result +} + +fn gen_dnsmasq(config: &Config) -> String { + let mut out = String::new(); + + for (network, devices) in &config.networks { + for pd in process_network(network, devices) { + if pd.just_mac { + continue; + } + if let Some(domains) = &pd.device.domains { + for domain in domains { + out.push_str(&format!("address=/{}/{}\n", domain, pd.ip)); + out.push_str(&format!("address=/.{}/{}\n", domain, pd.ip)); + } + } + } + } + + for gm in &config.general_mappings { + for domain in &gm.domains { + out.push_str(&format!("address=/{}/{}\n", domain, gm.ip)); + out.push_str(&format!("address=/.{}/{}\n", domain, gm.ip)); + } + } + + out +} + +fn gen_ethers(config: &Config) -> String { + let mut out = String::new(); + + for (network, devices) in &config.networks { + let cap = |s: &str| { + let mut c = s.chars(); + match c.next() { + None => String::new(), + Some(f) => f.to_uppercase().collect::() + c.as_str(), + } + }; + out.push_str(&format!("#{}\n", cap(network))); + + for pd in process_network(network, devices) { + if !pd.just_mac { + out.push_str(&format!("{} {}\n", pd.device.mac, pd.ip)); + } + out.push_str(&format!("{} {}\n", pd.device.mac, pd.host)); + } + } + + out +} + +fn main() { + let cmd = std::env::args().nth(1).unwrap_or_default(); + + let mut input = String::new(); + io::stdin().read_to_string(&mut input).expect("failed to read stdin"); + + let config: Config = serde_json::from_str(&input).expect("invalid config JSON"); + + let output = match cmd.as_str() { + "dnsmasq" => gen_dnsmasq(&config), + "ethers" => gen_ethers(&config), + _ => { + eprintln!("usage: openwrt-gen "); + std::process::exit(1); + } + }; + + print!("{}", output); +} diff --git a/openwrt-routers/glmain.nix b/openwrt-routers/glmain.nix new file mode 100644 index 0000000..4ecd45c --- /dev/null +++ b/openwrt-routers/glmain.nix @@ -0,0 +1,8 @@ +{ + router = { + ip = "10.0.0.1"; + user = "root"; + }; + + configSecret = ../secrets/glmain.json.age; +} diff --git a/secrets.nix b/secrets.nix index ec445a2..e91e633 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,4 +1,16 @@ let - ari = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLp2hDlkPNyOoU/4evHPIyCdQQCsCOBqP59klwHWvH0 ariel@sosnovsky.ca"; + ari = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdRSMk+ktnGcaa9KtGytKkQJ7zyHo/D2uj67snR9M2C ari@fwbook"; + minipc1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP42vtV9Qo7q5F9M/rCGD/TIZG3d0mm1uP6lMvy3zF/a root@nixos"; + minipc2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqi2WT0pa8m+kZNN2Rrg1F01zwTvkCwD3wjSOBNvSjz root@nixos"; + minipc3 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEbvoe/UvhpRSWVXMCyj/qzuR7WnJdNF7CYRmmJE3yYu root@minisf1"; + terra1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHBKI8gqd7DDubShle4D3JGq61BP1NBKCZ81V3C9uyym root@nixos"; in -{ } +{ + "secrets/dns-addresses.conf.age".publicKeys = [ + ari + minipc1 + minipc2 + minipc3 + terra1 + ]; +} diff --git a/secrets/.gitkeep b/secrets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/secrets/dns-addresses.conf.age b/secrets/dns-addresses.conf.age new file mode 100644 index 0000000000000000000000000000000000000000..0aeb98724f07ec3186fcd300e5727b849e58a1a2 GIT binary patch literal 1323 zcmZ9|X;Tvi007W>p+-f;1F>j>qob0>Y_3hBQ6~pUHsl}|Icm`mHX+%~F1fR@wu*{c zERG0Tg{lPvkG5KgisCq}RojV2y#->iW5$bmR6tP_(|+a`yqRZpz*HEsd5IFg6UP?d zUI#5mCsCJ>eZFEUT*P3r={&Ls(gJP)8H6-2oMSCS5=WAeJ1B2@GjbtHTvU ztjvHfXtf&_L-+ZXo4FV3Q`I)N7?yeXhhKl@zL-sL^8af^41$rwIvzkF8`P zJdP@7u%^QqW`=-F=Y;Kgu}&xUArT5!W(2&b6L#p>GFh>LFq<%ijY3n3Sx^88k+^C( zE8u}mpx?^z>T{h&t<|prC=s_wpdk|)22-tPD#LCx zmnP!aa*e1=M+t^i0lWlY`*6@maRl_3K`Mbr5XGn^!o^sjTI~8i)D#vnl$b|kv06-p zh*%<~=tMa>3{p7MIEhN7k}*b35$=u{9fUnk%wdK#Od+B)IOQ6FFxT#Jxl|rK9RRdU zKL;VbpD69;KB(oc*UPACA@5D|r84`y6xQ~Lsxg3c^11jq%Fm;U>*8a81{+Fjm&T;yC%E^-H76xgE^J*ny;*z> zNI7+TdS8a%d3mz!I{&@4di9eQE_h&VUSF(x+mXbK{Y~HWk3T7Q87)n{SDtiOq3-gX zS;@=M4GWTICZDa06)kjDRbx!QaF}@}wDs)cf>i#EDHLC%FOWvZ87-V%V%pAd(9agdtQB{4!@}{^;-3@yWN2_?xC;4r>PB> z%4+VnFIR9r>-I;e&vvx`@*=&Mb;~kwX)6Bh?6)6woNj%K&YK$lKIW@R z8x`v=-MK6Ap`&0}R$DxR%@#dLa9c*yOp%tSr!{u*IMTy4mbZVF%p0D)@baz7%+8v3 z?oBtXEmwn?_;33=x5`<3)zFh+xBbT#*}Zd+1HI{!pJtrE^(}kicSC~Y!Tz3nM`Z2GN7G-`gOer4_sE8D%0(ixO(qZJGBPdYU+SXte8S&D2FWHNT?r<&d8K`)fvw rokZQuOXLgA4L!yjLq7j8{`aXX`-~|AYtc`;hW;^dNAm9w@#Fsh`I95% literal 0 HcmV?d00001 diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age new file mode 100644 index 0000000000000000000000000000000000000000..7bed1a62f0471f20983f28c5b9974dba26a9e63f GIT binary patch literal 5935 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