diff --git a/hosts/myself/default.nix b/hosts/myself/default.nix index b214b5f..48c2c8d 100644 --- a/hosts/myself/default.nix +++ b/hosts/myself/default.nix @@ -13,39 +13,12 @@ vim xonsh ]; + + greg.tailscale.enable = true; + services = { openssh.enable = true; }; - systemd.services = let - def = id: { - enable = true; - ephemeral = false; - extraEnvironment = { - HTTP_PORT_MIN = builtins.toString (8000 + id); - HTTP_PORT_MAX = builtins.toString (8000 + id); - }; - extraLabels = [ "nixos" "isaiah" ]; - name = "isaiah-nix-${builtins.toString id}"; - nodeRuntimes = [ "node20" ]; - package = pkgs.github-runner; - replace = true; - runnerGroup = null; - serviceOverrides = { - Group = "vboxusers"; - }; - tokenFile = "/etc/github_token"; - user = "runner"; - url = "https://github.com/greg-hellings/vms"; - workDir = "/home/runner/${builtins.toString id}"; - }; - runner = a: {}; - in { - gh-one = (runner { inherit config lib pkgs; svcName = "gh-one"; cfg = def 1; }); - gh-two = (runner { inherit config lib pkgs; svcName = "gh-two"; cfg = def 2; }); - gh-three = (runner { inherit config lib pkgs; svcName = "gh-three"; cfg = def 3; }); - gh-four = (runner { inherit config lib pkgs; svcName = "gh-four"; cfg = def 4; }); - gh-five = (runner { inherit config lib pkgs; svcName = "gh-five"; cfg = def 5; }); - }; networking = { hostName = "myself"; useDHCP = false; diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index 802423a..db426c6 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: let extraPackages = with pkgs; [ @@ -14,58 +14,76 @@ let xorriso ]; - secretsList = [ - "secret" - "otp" - "db" - "jws" - ]; - - secretsPaths = { - secret = "/var/lib/secret"; - otp = "/var/lib/otp"; - db = "/var/lib/db"; - jws = "/var/lib/jws"; - key = "/var/lib/registry-key"; - cert = "/var/lib/registry-cert"; - }; + gitlabStateDir = "/var/lib/gitlab"; registryPort = 8001; in { - age.secrets = { - gitlab-secret.file = ../../secrets/gitlab/secret.age; - gitlab-otp.file = ../../secrets/gitlab/otp.age; - gitlab-db.file = ../../secrets/gitlab/db.age; - gitlab-jws.file = ../../secrets/gitlab/jws.age; - gitlab-key.file = ../../secrets/gitlab/key.age; - gitlab-cert.file = ../../secrets/gitlab/cert.age; + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ 80 registryPort ]; + }; + nat = { + enable = true; + internalInterfaces = [ "ve-+" ]; + externalInterface = "enp38s0"; + }; }; + greg.proxies."isaiah.thehellings.lan".target = "http://192.168.200.2"; + + system.activationScripts.makeGitlabDir = lib.stringAfter [ "var" ] "mkdir -p ${gitlabStateDir} && touch ${gitlabStateDir}/touch"; + containers.gitlab = { autoStart = true; bindMounts = { "/var/gitlab/state" = { - hostPath = "/var/lib/gitlab"; + hostPath = gitlabStateDir; + isReadOnly = false; }; - "${secretsPaths.secret}".hostPath = config.age.secrets.gitlab-secret.path; - "${secretsPaths.otp}".hostPath = config.age.secrets.gitlab-otp.path; - "${secretsPaths.db}".hostPath = config.age.secrets.gitlab-db.path; - "${secretsPaths.jws}".hostPath = config.age.secrets.gitlab-jws.path; - "${secretsPaths.key}".hostPath = config.age.secrets.gitlab-key.path; - "${secretsPaths.cert}".hostPath = config.age.secrets.gitlab-cert.path; + "/etc/ssh".hostPath = "/etc/ssh"; }; privateNetwork = true; hostAddress = "192.168.200.1"; - localAddress = "192.168.20..2"; + localAddress = "192.168.200.2"; config = { config, pkgs, ... }: { + imports = [ + inputs.agenix.nixosModules.default + ../../modules-linux/proxy.nix + ]; + + age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + age.secretsMountPoint = "/run/derp"; + age.secrets = let + cfg = n: { file = ../../secrets/gitlab/${n}.age; owner = "github"; mode = "0444"; }; + in { + gitlab-secret = cfg "secret"; + gitlab-otp = cfg "otp"; + gitlab-db = cfg "db"; + gitlab-jws = cfg "jws"; + gitlab-key = cfg "key"; + gitlab-cert = cfg "cert"; + }; + + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ 80 registryPort ]; + }; + useHostResolvConf = lib.mkForce false; + }; + + greg.proxies."192.168.200.2".target = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + services = { + resolved.enable = true; gitlab = { enable = true; backup = { keepTime = 288; startAt = [ "03:00" ]; }; - host = "10.42.1.6"; # Just for now... + host = "isaiah.thehellings.lan"; # Just for now... https = false; initialRootEmail = "greg@thehellings.com"; initialRootPasswordFile = pkgs.writeText "initialRootPassword" "root_password"; @@ -81,15 +99,15 @@ in { redisUrl = "unix:${config.services.redis.servers.gitlab.unixSocket}"; registry = { enable = true; - certFile = secretsPaths.cert; - keyFile = secretsPaths.key; + certFile = config.age.secrets.gitlab-cert.path; + keyFile = config.age.secrets.gitlab-key.path; externalPort = registryPort; }; secrets = { - secretFile = secretsPaths.secret; - otpFile = secretsPaths.otp; - dbFile = secretsPaths.db; - jwsFile = secretsPaths.jws; + secretFile = config.age.secrets.gitlab-secret.path; + otpFile = config.age.secrets.gitlab-otp.path; + dbFile = config.age.secrets.gitlab-db.path; + jwsFile = config.age.secrets.gitlab-jws.path; }; }; @@ -111,7 +129,6 @@ in { redis.servers.gitlab = { enable = true; - logfile = "/var/log/redis-gitlab.log"; }; }; system.stateVersion = "24.05"; diff --git a/secrets/3proxy.age b/secrets/3proxy.age index 42899d5..1bd4ecf 100644 --- a/secrets/3proxy.age +++ b/secrets/3proxy.age @@ -1,39 +1,22 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg 7dHhR103gbtPGP5RAvVKTl4Vb+sLW7H9bNMmQKbnhhY -zDOsVVDSCeq2uwYnzmbVgzWoZmPNNiUXKqGHTMSGWL4 --> ssh-ed25519 YJiRbw DnhzgnFZ7BxWFWeuLWUm8FtoPIGV5/HPXioKAnsUYQA -6sUPzEo2CkswK67sGdUtWsFoQMviC2dEMJjribIuiQs --> ssh-ed25519 Nl/5yA qFQufKwNg+7CnY2xrQ2gah9iViODV+WJpZRUrFvbSm0 -Tin2uwflX1DCQOPdPBWtnbIyQ3tXno4o6CfQxGx2ntc --> ssh-rsa FS7DnA -KdOiF1ARa+gGiz3SO6Frp02otEsMK4P3Re/ZCzDmcXC92AkzVvmVNCKGa2s6aTWd -PYiV7Xl0J6NAaOsmCKL+o7wh1949puueGzGniKT2AewoJBXcS3qiv54vs8uLxUEp -Flu/3fugJzYpEFpYr2UpYUOb/TxO7dRbJUYwJ4Rj7O6BmCTr8xtOZ7HFb05UsWuD -GKC2pfDaFcwq5W9+o8r7Cofj501ZZmntiAzwXcKp0rpwAnnTrrDRQYE3kPvaDLOI -vbud2enX5ZXJp9XUiXKdcQmdL1YpFXUii3N0lNjx76vx7dTsjW3hCMxcA+SN+j+/ -97yYQ81Be5uF8piqjjCIA5KkZoSZAIW3siaYn9sF/ApSvL6ElWxkyzTUgkAYqBol -+4aFUVNfmj0afpQv+D/YuRLQC+E2383gLahhhH7N1HJXHkgUWvIDcZvkNZfyUUMu -RqRKfGWqaxPVMpA2zB5Tpv+w0KFKYyeuXh934LkgblG5350rr3M2xMMGXJiHIasQ -jKzsgPjnYN9X53LrcaMJP3EeC520l3kRXeJ9c10AN5EfHIJujUv0CMbqwhHG6VRv -2cUMcGPksqeYNODYM1bKqcptho2W+d2G0D0sfyz82AvcGMb7x7XhAmDxz7c4Ksql -ROPdQLv9uWzzQBt+CA+N2T3an4ZT4bpWVrjDtexoGzqbraFszYRAMIqtfov2ZFgr -AWjh3zFkJbuSRhcRrflsiS5ClLdrdAVPYyp2vKKBYU/vEr8AwubU/+7Rb7lmq5+n -lR0CJZizE+kbuj8zQ7x25vUp25OhrLIMbyGbHODxOdy1v8xewu5Gs35wKmt6rdSv -2ne8leoJa1H+RIrIlPKmOVP05aYamxXCHIjSxZVWynnD+3Uax2AQlMLaokEk/jtJ -4f+L10B6mKptoTUUWheBq+3NkphWl4ej1EUkYtzmYD+GBp9KSM5eiO10obIgDAza -CgF+dKsYyn8cNU2rXxYlPA+1hLz3fbrr/srKnme0NSUQlCWiF+pupdt08lOSggVJ -DGWfw6j/5sI3bjPlhmRcb0C4PJMuGy4rxjVi/znx2RHH1/4d5n5KpRY9ikUxcnyI -N2DFxbs/L52VB+37n3DF0b982VTM34ZapC4TxgrVjywJEIujiGUZsnLUcY5QiRJ6 -C2St2zHW63fw5rUJCy9Cwl2fYk+mtJSn8QqPP/gFg9wYR68t/Cq8+mfv9ZAFD8V8 -FThx0Yf32wdk+ZvcQt2YwNoWVZyD101czMTtOltpr6AZMPd51XfP4KdAD7NRNPTw -bsxHqysYbWs4jAdPtvw3xpeDf4aCQPth61O/sTllsNwiyFreeTbNH25ulbR5u4HS -0vDG9tBmWn3s33rsmwHJEw --> ssh-ed25519 FpzvfQ Iu9NXPmEQNez/+2zV4I+G86R18mpNJbnlUhrVz58xzc -YvBbOwgIVJxBFQlBs64svFlCMhl5bG5rppcw2pxWr+Y --> ssh-ed25519 GdLgCQ wL2SvqLOK8pBRHvddI9E+9uUDD+XrWllaWuIiVY1RiE -gZX1zmLKq4k51Idn0zbtJmTO3FTrYoy1riUYCWDUB+k --> #u'<-grease -xGK2+VHotiHbAVj0MTJZYJeUWiSAnrwT1kHFWmuTizdXnPE8Moqf6HVqiaXW//ST -hLI ---- LBYSsJvCyztZSv+T+xGxQLmmwjwP0Neh0u8F59i9D1c -(5-, )N! vyk9#~i{i OGf~lp%y-+R|gK=8 \ No newline at end of file +-> ssh-ed25519 mOmPfg GK3pWt/pGBmZBDxtz9p2yCE0r9mKZfw2nUBuz0C1Lj8 +Ng6yctVSNN2bDhVC7NxyJlrFHr72aM4nsFb5JrF+f4k +-> ssh-ed25519 YJiRbw 5loX0JGTDoHEDiw+lQ7FHjDTYDHUp9RTpWPAFknUPHs +ICR+JwA34Uv+OWteN9x9QYyYg/rzvJSoTP2G4cPoiQo +-> ssh-ed25519 aY2AXA vDhADJHQnXw+mCWqnwZ8c+nmMSzW6Lsp30Atn99CKR0 +LWHKqQkYnlClhlsIra39Z3LPCwhCgAHy6S4wAaCUKFs +-> ssh-ed25519 Nl/5yA EdPvtg40BH8myVXONns0E2Nclv2jenX7uaBR1Ibw8CQ +oT04xxYo50xB4DaYbKRotAShX2pbSyeT00545+eEaWo +-> ssh-ed25519 GdLgCQ QJCB33L9Aow2G32XyuK/Rx8G/Nq0x43bp+uPYZu2QzU +Bm5wykmKFn4RhHeNq2IRWobe0Kxm2UgoE0jJLwrzuMA +-> ssh-ed25519 tOH/HQ j3hgRxHOgDUo+og3rRsimh1rKDYfsxI8glxhJpyw3is +/+xrS2iVbrRKd0WKclQz/gXDh5MQc+7u+L4lT1aj7VQ +-> ssh-ed25519 FpzvfQ 4W3mHei1YzB8JYM8dCXh0YmyrbvJPfd6ng/6nqidHDw +UKneBBrT45XOPAaCA8vAIM2tguO+GDQlUyhA5XKytXo +-> ssh-ed25519 kdPvzQ qxZe91vbHOrvi1OFK+V+t0ZIl5b2yjjLPVz+dLivVHw +Acen1YgVJJo5pW8prFn+U7jkBy6HES2iHIgKpNtQd5Y +-> !-grease n q34 L4% +0iWB4nX4CflthHMz3/l+nmtQ/eCPbCDGw5P533vTxaKap9K2z+Yd2uMEdWw/uTnM +kWJtie4FxQ+jL5ApYdeUAFts6XnBGVUnbE8PsNjU19GPB0hjqiO/KEQ2 +--- Swg2l7QelpCAMMxAKWHQTGMHs+zxbm+RVXBIMfUWSqg +擊#ޱ.q"s_^fGd+/O)'c.1wAZrzr/) \ No newline at end of file diff --git a/secrets/drone.age b/secrets/drone.age index a315d43..ef33799 100644 --- a/secrets/drone.age +++ b/secrets/drone.age @@ -1,39 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg WAja/IvMSNM4ilMqPoC1se3bVfq22K3jWlqUFR0PBXw -TqAr12djCXTWX8+pBIw4lLuUCzazNI1JDvyLdTWGubU --> ssh-ed25519 YJiRbw b9XQ50WPz1znA7ZcBOK2S0qASanLoA9s+2GK6oFGRzg -T5RZNZfzXbf2BxuWPwokqx8stEA9oZKt7VgiTo3a2Yc --> ssh-ed25519 Nl/5yA BACTkOUzDjPf1tLVQ2KfL0UoOGUdEynDGhe8hU5ZTlM -lamKkIgPfCxTNAkMf5A4xT4AEwwaMuZhtiKwuMTne04 --> ssh-rsa FS7DnA -KqK5cqUkWzXwv7O+ugAE7X5+nx9sRWZeiFm1b6iiZxv9vitAgC4b+X2CrsYBlRbl -WzOsbLb53qPgMp6UKpqQPLWmtRIAWJspauB4NE8qiVkuROBGZvOpzJnu6+PHPj5d -08iw6MgqNZmSpj7RTKTE3yblpNYhqHlWQJ8UPPXqDcqf/KaLHHGtHi9sAA4AQEHl -4weGx21orpP6olq6NMkuwrCNDCAjsY4V4+vy3E0aJPjkQnP5c3Wk2Qzf80WvgtiP -C35lyeUivE+lD9NuqMVkLU8EGMHTWXRpYr88vJ/TjSjBaSMp0N+BumfKPM/41bEj -8VHB0B0OzLyKDkEkh7RKuNvYOKUM+1AHA/lMFmFqpS/BbeVRHTMVLuwr1DF3VM0z -DD4+aGB9dluj6+81Lvo2uC4Gx3GtIAAQnkGOVRemRMVTCM+8pPdp0DxNWuE+1P78 -ZZ+tvBg6m9birSA5CEptGGcclG57T7NGsVR0UgWpKmGZxPs8uPvWCXbDa3VJCL2Y -vwyHyphc/QjLi+YvdJbeNhLMek6YTWNVxcdPGC71RVwvFoYI1+VeYqXVFvbe1Em6 -3Jz5o66Qv0yrk+s8cnlZii8Q7jwERybnj/W9yU1I8iUFLYoEquGzGE5y5M/aMcaT -9F86Y6XjuFMq8aSMBMIvMCRDIJWBsTbL03bGtLjbKOMHlBYj2P3EurjITdnMFQQq -xjBcu0MBlRn3ZtfC8OePa6omDnhVOxhxdYsDIaGdRjVm5wKDlDrAi+zlE3e3G7se -nfOwBkdHi6Lwsy36ytYGIT64etGTnnFyL66Z4xmXTY1SQzMMh94F2UZGZ3IHjjg8 -7dZI69G+xgwHl9pSWcr3SdFTCcvZk5kGc6nOCu1GW/dS8Fo4xmm3V0Qeo0UC7h7E -ViYhO+nxeJkA0GFdvg+OuFwUzTNIGPqi8xPYYDtW0ei6lym+h+tXA5ycaEFLpUy7 -m7oayTY7yczfj+3/6As9ypvJvnUhbzPBZNSmSfZmLbuq4ACiTvf21oFopkWKNpfy -u7dxUyOu33U88OiaYizSLrdS2ct+qImLsvGikuj6WCGueB0QJVOgH6Nr6aRbGm/B -ehWnNdcUZVpkrZ95YFOk4HQNIfIYABLwniM9ZxZJ7MB2WsjOeFPCeTHUt6JhMF1F -nCgD+QmTah8selrU5/EMoWOkZZLjzgLBmLzhq/6FSC3RZ5ablgJHClR9nptrocj2 -JTVKgiIWVF/ZTf6R04iELQqBtYH1C9zMpFwywPJseIQiWwmjwhKiwzgIqGYXJsTM -0YezoOxQep85OZtPhrpUWFxuAp2iQqr19EzP/7EKtnRCGt611dtyFFcnVIeKxRin -4S/k96s5dWHV3DMs2OjPqg --> ssh-ed25519 FpzvfQ 84pOpWlGjMPla9mNoPbQExiPIJ/skEAEcmlBl4HKqW4 -LU8KXVx7K4qj99EIJWESQNywm2zQU3wSEfT3F8xckWo --> ssh-ed25519 GdLgCQ Bcg8rIy5zjk5rjeYcE0oxXAXgoO5wj+Nu9oOf3JUiHU -jut2YXWVDMoaHgarXo4jsv+xoxf0QItFI1qIyTI9Bf4 --> .|-grease /a W ,O -LlGkqFUCyR1KwczNgSSR2cejAy6xizQ2q7REqGTkHzHcCi+u8RV608edT0zo2bwx -JDw2YR+AJVh1F7DJ ---- hgc0+BI0Qe5Ubygsv8LWg3Zz2PX74F32DtAOReSkBck -s!`/_R^[c>Lvրv I*wT1Y,*Qܢ0ȁ{ߴo ]$9B~Lx٢|?_]Iۘl 4%l.!鯅ZTo}HFd/z_ !Шg9}FjB]Lv (0Yw8ko)l$ \ No newline at end of file +-> ssh-ed25519 mOmPfg zbxL24+v+GwXjE6RnxO1HetUZRTgMPYhl4XIpr4uBio +SOWOXvkgQcS9lbCTD34qoQTfd6cfM3ImLp122HryeV8 +-> ssh-ed25519 YJiRbw UBuxNngD0uF39xMt2o8E6xbe+hzJXCLgvR7sgxxyVFE +ZNH5Y7U2XtAoGN74RojIHK4cqhMKo6gUjqIvnQ4BFQ0 +-> ssh-ed25519 aY2AXA xG0S3hoDMdM8LaEB3nXIQYwPrOmxMLd9X844zNRXGx4 +lCORshZVIAxbxNFLC5dHef57e+4qYRFaTb/kvpeNR+o +-> ssh-ed25519 Nl/5yA jL9J2tU5n+pvh/sOwHmLZHuv4VNv8RLKbV1tGgdISyE +4pKqcJ7pHXNL8KXlMQs3iiA/ZMulpsl4uqX3bDBqAMI +-> ssh-ed25519 GdLgCQ ypdeJ+3uGqcJbiHtvVrzye4enHZKosI2NC6Kj7Etjww +WlA9eaX2sE/s8zGtkoJT3Pxc/o0DPCe5DppyBSu/gJQ +-> ssh-ed25519 tOH/HQ rc4VxBQqMed+H+KT3P8XlCMn6dGcw08G7MtKOcLGBQU +4aVKbAQ+ffb4WGNw88mMcndj1AV/8LPh7tV/DMpp42U +-> ssh-ed25519 FpzvfQ Pj0kOpEdohxqBt7N/IsbvxtrpfA2ykFNV14yZ+jy5Sw +67Fd5u1nGJPOSo0EDbz/a0cuLrSCprNaMrlEJmY0jf8 +-> ssh-ed25519 kdPvzQ JwvrS5pgnjYhUFYyc6i3ynViM+PXQnoShs/UqY25lAE +rnXbZ8Rwrwfq9OuBR0YCKZlQVq2Yp9T+vN/2atGPGyo +-> sT@-)-grease (Rl{64q n +nzqh3H9Kftzt4WQkdGvPAFWVi/O9H1BUpywP//JxXtSn +--- asK33tfF2/Uih7HBjGxoPqEavxUf4Nkyfj0Fx2L9i3Y +oT S 2RܔiQzV} 3#kr#:q-fu$oo!.[j$d J;"BLkOJe%x+E]i]'t\bUB\r6#E8/QSv;>;{o'ڸ8mrmV'Cw\7?YS1xPlHGڇ \ No newline at end of file diff --git a/secrets/gitlab/cert.age b/secrets/gitlab/cert.age index 80a6d0f..5f746a0 100644 Binary files a/secrets/gitlab/cert.age and b/secrets/gitlab/cert.age differ diff --git a/secrets/gitlab/db.age b/secrets/gitlab/db.age index b55f095..ddadf66 100644 --- a/secrets/gitlab/db.age +++ b/secrets/gitlab/db.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg 5aqdEg4OJNg6Pw10HFpFKoRWZLvaiqsh0UWW2N5ql1Y -JfnQad6DgEqvRT7GJpjg+kFjgkz9P/Dc+rE3azeArOs --> ssh-ed25519 YJiRbw R7DVCK0kirWs/OhPg4zUGqLMdO1usfDZNnmY5jndSQM -D47/wwjjRuzVSBdd5BG6nL4s1TtAGCBvrdGuwanyV68 --> ssh-ed25519 Nl/5yA JkVW7aHVpsqPKY9wPoxS2MNCfmYv20Sk+844sNGjQxM -VojCPfa0dUGph/PJjocKVIGC1k9XYLiNfv7CPJyM8BY --> ssh-ed25519 GdLgCQ WULneYbP+M1DrFX5JLVeCtkHycxtFBm9/x+oUXTu7Uk -2ez2hdvzXfhOePZsVzrVL+9XanmhyqcK/XkLdV43x68 --> ssh-ed25519 tOH/HQ hHa+OtsIBPtYkDChXg2vhWhYdSqruooaWiPbdk9RgVQ -Ku6StrR8ZICUQEnXeZZ6gXAQp49tbluPKQIAa3KfuCc --> ssh-ed25519 FpzvfQ DhdgZQSDKgmMmcitO4dHMJAbe+c67tfd8gDScp4Tvgc -h8PAX2B9t6VcqG9W1b0Z5moxD1b9P7Qgex6+ousoi3E --> ssh-ed25519 kdPvzQ sSSfEIPPvA99/ziU676wPt9uLrHBIXECTuUmszYcZSk -TcssCYpN5wQTPCay8/gOeot1f6FyUK7sEBkhdwPIG3g --> !Zmpi]O-grease KVI iU\+ he'#C -2O3D ---- Z3aUd7U6jlt1NiGY2oCzZKeD26gsiqB/Ysr+wRp7Y5E -T*#X )>D=>G|ZO2 `Fퟚ`f̎Z3+g=$ҫj1YԌxumqƅ \ No newline at end of file +-> ssh-ed25519 mOmPfg rO6ZgQ1fx0HyrrXjID9yWlB+F+7OmKXy73Hx2TflmAs +48jX2PYU3HZ5A4e6COG1iX4z+iyHT54op/6pwgLzdPA +-> ssh-ed25519 YJiRbw l0vxtLrtMHRbTVm91M0JkaXOdUWhmbSo2KTw+1NQhQM +bfrVU1DXqEHHsC/WxWexGdXaarO94VoS/c05Xe3FQZU +-> ssh-ed25519 aY2AXA ztbbZZgZCeb1dflXXuX9t337kosoEjuHOdqHHW7aKl4 ++h51ok6ReX8JNf9Mej4gEzWyCYQ3ex3Sej2ItLKKuaI +-> ssh-ed25519 Nl/5yA 7yonsTK0Wzh0KMbsRiui8btzabQszKFzUoJxjZnVH0M +i2E/8nKX8vYY+CyxayQzT3mXrXuP5DesdAbHdXh80JA +-> ssh-ed25519 GdLgCQ LufpIEDSbEn9syefFQOIwTa500EHr8tyWjFeKWm4/y4 +DuDAXT1wtKsIRL1W5o/O4DytCLuKzAR5zcTezM1Gp1g +-> ssh-ed25519 tOH/HQ phvLcGJGTUenkx3VswZUs6Xc9G2G81pbom43HFoM/QI +bapMhUoEMv5/jCumAL54L2OT1Zg+hlaKqnKHg50QvGA +-> ssh-ed25519 FpzvfQ 3PePdoAaUGl9Qq88XIyRs9obSUhe0QfHySS6vbptOXg +3tL0kYRwIqS+L66TUWP1LOf0eHBbvBPI5lrjpXj2/2g +-> ssh-ed25519 kdPvzQ +Ibjaf78ClsJzG9oC3FJ1D3U4FLZTTbxFGnQH1Lqxl4 +/pRam0JQWd5yIMNxEz9yhSli0nweUTqzX6RFOnkXEpE +-> 1Q='-C:-grease +92SOHBvWXi1ouiVRj18Bn9xoDNiL2g +--- Jg+OTJQi36S6rcx1Lj5/NLImTJmf077PmbKG8+zTA+o +T%KM_R R3EtipoP_罣$ 0F Qe6+ ayxsy'k8*\=sãQC \ No newline at end of file diff --git a/secrets/gitlab/jws.age b/secrets/gitlab/jws.age index 81cef5b..c6be44e 100644 --- a/secrets/gitlab/jws.age +++ b/secrets/gitlab/jws.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg kNX5PaaipRVvjzMrXxjhlTSJD550eSGoa5zDbI4zQVc -VAWoBCGuVqKgDw7yEi0YkeIlO+YwdxFoEdLVPXO9y0s --> ssh-ed25519 YJiRbw 9r/cKqXdhpXcDL9S8CDRGLD65Y8yopFGiMmWILtbXG4 -uifiAw7UCRkHc/uvwEnlzc7+2mKuLCYiAMREHzXdWZs --> ssh-ed25519 Nl/5yA eVSbQEyXXYEBBiMenLZ6uEP/NNlB4pW4GYMaww6KJTg -8L2cYg6eYSFHAeY1jgk3GPDOYQYHsRcSXZDMxDW0hBQ --> ssh-ed25519 GdLgCQ HDciLBHQg0Nhd8/QVfgY/6aOEfHdWMs2CwWjieKgIBM -/U/EP99DxhcMrhIa9ggQJSczTQCpDf2mzDJI0uXUYZo --> ssh-ed25519 tOH/HQ ZHmlo/urIFxi8zShOTUqJRuVpFm9RdNtDi6+Fc79dE0 -RC+z3vkORLSFETGPoSbaml7kfA5GG/NK1IwNwn2XD0c --> ssh-ed25519 FpzvfQ kQHudI+8AYPU9gWEp5rR5UeBoppKtdNONPgNpAGM0mo -025maJUyvy7QQpvv+eW7F0rOBMF3BBrwYHHnvwz67dk --> ssh-ed25519 kdPvzQ lUYVBtzSufAD2XZmIH3J788y9oTunIFSNjKIOjuFCBM -bvW8hq+4iFgTpDf0zBIcxWwKMq6xkdKgnjm8q3YYYDk --> NJL_l7-grease y4c : -kVPvEEpHy8iy//hr42NPPa1DWxgrk2+iAy3KqTZ4oQ ---- /muOWusu9T+JEtIWyMOb78bya/kLZ7AJ9VTNJeZrKLw -a{(F!&h,Ncy!66-<˃6tqi3 *WtXi|r?E'42YJ \ No newline at end of file +-> ssh-ed25519 mOmPfg i3txbBg4kys8cMeRiRehJSbfLhidIqsCyVIeNDgA3iI +nQzlncqSBf2Ov7pbUmjxRmzWPsgRrCMLdNbOA7815mw +-> ssh-ed25519 YJiRbw hKFHmcJ/OpAX6sJcUZs/g/i4fS+08c9hjMxMsvJNfBc +Ni2EGHXBPTT1AkaNLi5vTnK5iD2j3W3jWDHmcCAhATk +-> ssh-ed25519 aY2AXA hUyGC7tKrk/gb2RHboIsfmR2N9lqCbfrH9sCj6QoPEU +Zcx6hv9A/MTOzPUOHHDQN2EU+lPA6iMmIQe2ZpuNxpg +-> ssh-ed25519 Nl/5yA w2alcZRWKvtVCgTU4gDE0dV8EbOnasWXRSHxLmG9Fwc +4E5nyu6kvsNlreebEDyMXdJWVG794ALu46DmbK5kyt4 +-> ssh-ed25519 GdLgCQ yPWhFRh4u8HZrg8JGrwFELng3Fd8Mqdcs+6SZ+KIQjg +cbwe12qwFFX5WLfeEW8J4dFpfJHn03s5dTR0Kk2ADa0 +-> ssh-ed25519 tOH/HQ AG+CKGCyKhhzsU0o4KK2lRvbmcfubzQ2f/wx/Ip1ojc +BQzVeyY8xPb762aWihrxNvRgH4NFWZitFLEsS6kTRUg +-> ssh-ed25519 FpzvfQ /C44Mro81QRF4k8pHX0iQl2Y4Y/AguV5IDWCUydXpQ4 +QI17IQqzyx0t4Us2YdOghjUZ9vnFdnpryYwL/T0Njj0 +-> ssh-ed25519 kdPvzQ /NkVwO2FouBiK5XEaq2Tnfac7XboO+sgqeUbT/EU70Q +HsIdyJSBVJCztDTwh/bE+iIqC6d5igIteLlemnUy79w +-> "f+UjYRr-grease +vMyb24U +--- 3zwcLiZPsyoSxNlBP1M+Lx0g0OF6XnwL+QzCZj0yBTU +uV oc39s݀ŷ8Mx1&q ,FWӓ \'~jsjʚ4 :¿h!,# \ No newline at end of file diff --git a/secrets/gitlab/key.age b/secrets/gitlab/key.age index 38d0f7e..a86267e 100644 Binary files a/secrets/gitlab/key.age and b/secrets/gitlab/key.age differ diff --git a/secrets/gitlab/otp.age b/secrets/gitlab/otp.age index 6f3c7d3..f73e7cf 100644 --- a/secrets/gitlab/otp.age +++ b/secrets/gitlab/otp.age @@ -1,20 +1,22 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg LVJSQ+R7PMpUpKdscHK4alpoivahuvF6hISGdY7gujU -XsmhzzTlEIWo8trvWg7wL6uI6bnHmc71tS8OIz61Xus --> ssh-ed25519 YJiRbw Nl46Ujkg1RQDQ3jo6MoOWvOuiAce2Vhmk43wDiKC03M -Si/YWv3MSpQAwiD+IQWUD8eWPsWwI19ojsi46+ENr7Y --> ssh-ed25519 Nl/5yA XDT/tyZ+W5dT1VkBNQcpYMtebHc/37K0hY6kMrtOzl0 -ugulqsgQ5Wp9t7nwhbYvdmL/9YAkpiTF0hJSVPiOvEA --> ssh-ed25519 GdLgCQ hlBfw0CRRL+d7g5Xxp9zjOVGkO5wy8PAA7ukMCAb5Vg -MDrDCysJ3LJ7o0y/bXkxnx41Bq6Wr0EYEpqeBkbtbPc --> ssh-ed25519 tOH/HQ 8QGmTG8sbWch2xOFqf9SfLiMY8hLmwIfWMOuHUg+AE4 -3cMeP+NMohzZ8ecMqKEvOo3vta+m1aUtQPBg+jCjyQs --> ssh-ed25519 FpzvfQ cCNXN61RMnEqcGw199t2xZHug3qVrdtaSkbnqO4Onx8 -MfJHCpsMULqxj2/NSJob24uhFZR0ZhbIh1Arncs9bPw --> ssh-ed25519 kdPvzQ SDan5OS6ZlZ6+btBx/nDwrPt1kAucMDVZZNlYnAFYA4 -cW6PL2fA8xazBvEe7SjW14o8R4djmCDmtuU8Z1+AEGw --> }d^ -l78JedCUzpJH0PazQTE3FhpXmW39G5W78avwFQ ---- OvRr3P4ypXczMWZTi7HrsbPEz17jPYAS/k+XScuzEJM -v)WHr/w% -3+rǫK/ￍ*^{:2dbXCd aQ( +7"|L43E=?t߁ \ No newline at end of file +-> ssh-ed25519 mOmPfg dPHmReEX0nQopFPzw48N45GXHJZqM88rKqjXr7aLvRE +8/JLs9IzzpstzPjLdtCJSvS4o8vhVcRenVBBq4TusgQ +-> ssh-ed25519 YJiRbw Lo/LGlWvskMSWecho//5MFyWalZhhLM3KZEkAkLR5TM +tsUJrJupmGZPHq+unRDILfeRzrDhRAYNWMfxCxW2KIs +-> ssh-ed25519 aY2AXA cHX5cypXE6shMyzp+uo8piV8wwp6bS68QHIPpy6hDSY +aIyd383aTfc+E/ilLzNmNm/CPYpBQZKZezpJaMgDkFU +-> ssh-ed25519 Nl/5yA DgSaDgxxVzk4OrH/Ypvf1qyHcCMtQs+5Juk5kPqx/yM +fwCHzRWTkyySRI9J8iwXTOZLbR6UJX24xhe9cAfQlq4 +-> ssh-ed25519 GdLgCQ u/raaSJyxy21pJZLAzJCQsAY+4kfGStRW33nYUTxlzg +mp6BoDXJ3uV43Z5L2QUqWNYgQ49xb1gL/Tv+jDHiyOA +-> ssh-ed25519 tOH/HQ 6DkUTCDbKMqXJ4+Pa4AsOhvwrt4IarMAVCoGSPDCcHI +TQPN20WDlXVK7ZLmMMLqE14unhqYZKUL7QzO8YydVJo +-> ssh-ed25519 FpzvfQ cKkxOgxV2j2F4aL+lX/LwurNQjaVxbaGtteoxWMTrXE +MiguFmSTNR9WWh3VvK8XMXiTm4pGgJNd2XD0tVtCiGk +-> ssh-ed25519 kdPvzQ mO2tE6X44CJH0KsB+zSQEJ5V7jU9FF4B2geVU7pBtBc +y2qoTsNDPNoCgMZUZJkGaRPYUyTBwRRjKb46kS7lLu0 +-> f-grease LIjJ5:Pi ENcgO_ KV|~ 4 +tjyNoV7a77oh/IWCQDsLW0GayQmRv041GUcgLX2wIH2Wvck9wAHFEtnl8Pve4o/z +1PA/o9uRLsZaCnjrwrbNXt0jbwKCOuA0iNkMGiELkbcfZeePkjKb4BVW8Ew +--- bi/jDV3F8w8G8SUuh/oXckY3A0VdrFZzMaAmYf93OtU +/d+VQ*}=':#K72wSf'|Oԡ {W1? FA ̛ \ No newline at end of file diff --git a/secrets/gitlab/secret.age b/secrets/gitlab/secret.age index 19f0a95..8a3af70 100644 Binary files a/secrets/gitlab/secret.age and b/secrets/gitlab/secret.age differ diff --git a/secrets/jude-forgejo-runner.age b/secrets/jude-forgejo-runner.age index 3db24a3..07f9332 100644 Binary files a/secrets/jude-forgejo-runner.age and b/secrets/jude-forgejo-runner.age differ diff --git a/secrets/linode-forgejo-runner.age b/secrets/linode-forgejo-runner.age index d1f5ff7..9f50e89 100644 Binary files a/secrets/linode-forgejo-runner.age and b/secrets/linode-forgejo-runner.age differ diff --git a/secrets/matrix.age b/secrets/matrix.age index f9c679d..142d1f3 100644 Binary files a/secrets/matrix.age and b/secrets/matrix.age differ diff --git a/secrets/nextcloudadmin.age b/secrets/nextcloudadmin.age index 2a2a5d8..fe564e7 100644 --- a/secrets/nextcloudadmin.age +++ b/secrets/nextcloudadmin.age @@ -1,38 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 mOmPfg B3R4LNyimq4w8ZJptUWyAlEawpCGqhhDbNdg4hJ4+CM -D9GPbn19Kb1MRiJio+DtVqzQLBNgMcxSLHioYH162Y4 --> ssh-ed25519 YJiRbw 5waVm+Z46zEyDD8KZAW6FNGyKjzP58QcTsT9gS6Hiyw -A/yO7sNrUeWByQzVGTjGA2I4f7G4TCUnEELcOCtCxwQ --> ssh-ed25519 Nl/5yA QaYAuv5+XnG4ummBdhqHwPQs9blMI7D50RKZ4FosUBQ -rIdkykKWPbHqR15eOzG497thdcb4LdM10Y1Xo+jxACg --> ssh-rsa FS7DnA -OEtESGATZF8GKpzgmew+nN6ikurUOMViyLXuggLgZzMZGPdXAZlCZRLpvNRxD1KV -EYaWM7TVjp50Ov8R0ZR1XyyjqhG3lMoQpEBnxmjE3MZcEDS9phnR4u/zWtZZCYfk -m88ieJaJGzg8+CFUHVnlMwPQweC6hyhdKZWN8J2O908JcpNBCc3QYd6gzUoOicF1 -0rfjwk8lGwLnkDAiSwwTey6gqh/hNkvVb+IUWPVJfxdszd6uFDtjQFvjgaTl93rk -TOp62UfS52n04zqXMSMFGTElP3OahZJGjA0Ee1EPoVNNdCyVY4K7niJRele4flg6 -JP/BFCAXqVsbHJyL8G+1ldQmmg6bNSxXgb81pFvsCzQzoBu/+wJ7l0VPcJ04k/Zq -4PAZVSzESQhngohbC4ibFpcWYEQEHtYae9tAe3x7W50RZVs8g5ffGxwCT4m0VCQd -e70j1eeFvVVXP3BUQBBcHua2BXc+UU+1x8WBASUEGc8zGlVckfvYeMtol9PYoieB -eajlncyMwseONHr1uXZ0Gsv38xumPyzdp7xUMYW+EmHOXVJjoEpu8t9fEEFnaBB+ -xDt3m9WIyy7Fdd99jQ+rM5fWd7vHYdszXwYs5NtHbN/PB6kmYtPJ7672wLxIp7or -2xz7ED6j2NTXCYIzTwNxu5WKxnpv9B5sbXPOR8lQKeywy3+7TsfTMMjHDefd+Hff -fmJpnGXScGoux9ZbuDOf2T425/dD+TDTU30DA7NwYGcVKkhP3f47qNSwSkwTXZlN -IqR2cic1IQLUI/od4na8XcINVnTmie4Tvnk+seIYzEwmf4YJodXl4fW+n0keHVBf -aQQCAOQgE1BxqZD7PlHw7eDfXHiY7XGcvGvYVPLV4WSOmVQ+lDCybxgrGnRIcR9o -13EQ+YQye4GvR4ndmWhWgtY/5OZeAgaxI+Uth/KM/v38Qw1IIqz2VqIQ2ehZ5W73 -aSgVHDIY4+5rAIkGvXUOauZ0E1OdJTdFEApwCp2dInY+jjCCdrfOLZgkMF+7jG2t -hHtZi0DM6xeniG4fQd+7qwepeWyHoGx7mh4HMHz/T6a66IqMaRA3EWLhQUHO041f -G3KV7X6rQrZdgD4yeXjnyWHKkySldm4oRodzsRxEWQBPKT4Vw4WNZDncqIMxOQiu -/K0OyHVEAjcHIqnKLRt1GsiubCGZK9YqtYNbgRn7ve7HWr4brvE2Se7WV5jnwGza -RzdZt0SdbFdeFTRix9ADIYLCXEHOLssjZy37XsSeIO6aaFhK5sq+J80pCv7sHJc6 -8jb1lUoB0YEjJr/22WKAif8avJ40fEZZRcPgd2NBiSwUHFWnIf+jetvU9N9ZNapQ -MTe2RI2Trd620gwUT2WUuw --> ssh-ed25519 FpzvfQ rGPYKh2xn9ovmn0UV2lF6jEi64c7uj7PjTaBuPIPj3g -pwvHpkS+5sQSNtpYtMnyPDBGm9mC/nosxrZgWdtCmBo --> ssh-ed25519 GdLgCQ DukkDpEfmfDNR9MnjOMIjyRJ8ub0Hv8gKE6EX12Emy0 -/ktSIdYR6sxwbsbrpxWby2y+a0xseb10IuOs2CMKY5k --> >|TN\.\/-grease g Wy(/zvy/ mRVSE uD4Cz -C9ik3h3oW90Z ---- I1rEn05JeEis5RwZCccQoEz5cDvJKsCG0xwUIWZHF5U -l`cq1 "I=0nXfԦoRֿ \ No newline at end of file +-> ssh-ed25519 mOmPfg xBjH7pAuWH2cPGW+xw3UDkIbhv6KxSVrKhqH1KMUQiw +ToQhtetm748ZL0mwYUY0ZlvbQ2ZIg8wGPdxDtJ2SJrQ +-> ssh-ed25519 YJiRbw VU9iO5HWdUyTdJDs96aSsq3LBrME7wyYo4HpNlyYhiE +jCstue9cpoXEpOckMJRWoMpl9LN85Qp5pfLPEO9mj88 +-> ssh-ed25519 aY2AXA qkBILo+nhOwl6gp7wgxJ2Jlt0nMthYHw43PDCA2lI0o +KQhTxEpP0UQ6mvsfTDm18OTsGnCRbeTH3CVqVVt4JLU +-> ssh-ed25519 Nl/5yA jN3QgulFHW8I5SIILlje7tqXui9+A+FIDdapnMWkxWs +1GiFm0zXWfsInAUGwlutxLLj5QTyrwpP0xp+uZgq9Fs +-> ssh-ed25519 GdLgCQ wjlz7QwkBOSApRi0+x4p3fWkN+eiHjqR+f9U5TEn3Tc +tzsvSMEgIxSJ5R2+arIYAXVCzQn00JGIWkKvT7YQTGc +-> ssh-ed25519 tOH/HQ stZ71enleNWbL+BTF8GZurEkU0KmfUR3DlbIKz0ZqSM +MTjePANxpKdMlxkvBVP1jXNUbO186iMrmavSz8ibYG0 +-> ssh-ed25519 FpzvfQ /eYN+NQ6Z/FBH5CoRUFUUIl1iazpk9Gw9Ui2W87RvXk +7v/Mx4RTPoH7kSC7OaGPANHBrMKfcGXjeSY3+3f6g9U +-> ssh-ed25519 kdPvzQ vmcZdQY0Pw9d0PiBqCsrU8AXRCgMXrzPK5PAElBMg1s +Ps8gaU3AkWb95ZZRWfvxw94iTLsjoGv70vEieOm+Fbo +-> d-grease sEDC jLi\%B (%U`d +d+Fy4R3mmj1J4b/dh6WM1Mk +--- lxFQMjbak9fSBSaxyD3R6exub/x+2y/eJeotB43/YVk +5$mn 8a"ꢘa-=V/ZL \ No newline at end of file