diff --git a/hosts/isaiah/default.nix b/hosts/isaiah/default.nix index 1315572..e2dca92 100644 --- a/hosts/isaiah/default.nix +++ b/hosts/isaiah/default.nix @@ -1,5 +1,5 @@ { - config, + #config, lib, top, ... @@ -11,8 +11,6 @@ ]; age.secrets = { - runner-reg.file = ../../secrets/gitlab/isaiah-podman-runner-reg.age; - docker-auth.file = ../../secrets/gitlab/docker-auth.age; runner-qemu.file = ../../secrets/gitlab/isaiah-qemu-runner-reg.age; }; @@ -82,34 +80,9 @@ settings = { concurrent = 5; }; - services = { - default = { - executor = "docker"; - authenticationTokenConfigFile = config.age.secrets.runner-reg.path; - dockerImage = "gitlab.shire-zebra.ts.net:5000/greg/ci-images/fedora:latest"; - dockerAllowedImages = [ - "alpine:*" - "debian:*" - "docker:*" - "fedora:*" - "python:*" - "ubuntu:*" - "registry.gitlab.com/gitlab-org/*" - "registry.thehellings.com/*/*/*:*" - "gitlab.shire-zebra.ts.net:5000/*/*/*:*" - ]; - dockerAllowedServices = [ - "docker:*" - "registry.thehellings.com/*/*/*:*" - "gitlab.shire-zebra.ts.net:5000/*/*/*:*" - ]; - dockerPrivileged = true; - dockerVolumes = [ - "/certs/client" - "/cache" - ]; + services = + { }; - }; }; k3s.clusterInit = true; # This is the first node in the cluster openssh = { @@ -118,11 +91,6 @@ }; }; - systemd.services.gitlab-runner = { - after = [ "network-online.target" ]; - requires = [ "network-online.target" ]; - }; - virtualisation = { libvirtd = { enable = true; diff --git a/secrets/gitlab/docker-auth.age b/secrets/gitlab/docker-auth.age deleted file mode 100644 index 8d47bcc..0000000 Binary files a/secrets/gitlab/docker-auth.age and /dev/null differ diff --git a/secrets/gitlab/isaiah-podman-runner-reg.age b/secrets/gitlab/isaiah-podman-runner-reg.age deleted file mode 100644 index 7ff27b5..0000000 --- a/secrets/gitlab/isaiah-podman-runner-reg.age +++ /dev/null @@ -1,42 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 64uajw eV9Zpp4/hT0/yqmxioNHFm4k8vcIYxUcut7IoDDyuA8 -f3UHC6bPtweXnJ6htSbHI9aGoFOekxSyP83jB8AXLJ4 --> ssh-ed25519 oyEmTw ncaobB5Yo3geYqqqGbgQAbL0ReboWV1Kd1VoaoUIqR8 -qgHrn4ecZ4/T1dBncpcXpx0+hQNS2RDxTD0w7UW7dQ0 --> ssh-ed25519 mOmPfg v0q7ExwR8khGaySaCBmWa2J6cte4kbzcJ/kzM63oFXI -vheRD95qqHoYHLKZwpajbavOECr0sM5o/P2aN9l7MU8 --> ssh-ed25519 YJiRbw ZUwjcDh2BgTiuZtg7HB7z3CDcaSWI6p00CdwSynM1Qo -Dj9E36auKUDim3+8Jyo8eOl7QD0JiGAyKJwGibiZRTg --> ssh-ed25519 aY2AXA 3OAFXfKEa17oKIvaLlqMIUt5ymogo/TjkNQq7a76tl0 -VVunUS5pgcRb6iarZKT1EpTV1fNJqR9GdMsoLOva1zI --> ssh-ed25519 xNtnoA Z9j4Y7Wf8vT5tJ87HEaYnjnklRrneHCo37pYUJ69bgc -0ZugVGxDqUT9Deq1Jf7f0mYnX3/mEYSgbgoburorUcc --> ssh-ed25519 AQhf1g cNcndnaIgUJh6J7+tgXey7MpYzOUoAp1p7TfAqmimEs -UkDmgozd1WjYh2EmL9gEKP/WLnG/ZuPRLttxKGLvBWA --> ssh-ed25519 B8wa7Q 9emGk7ySc9cqV5MWP4FMUgaokxsiaefV3BJLmQfIT3A -HcAfVurlttw8XECe3hl9LtcKsLypZZORKdzib6wUGJA --> ssh-ed25519 8UnW5Q U6vSV1xCzXM2pI730y7xPQOYeN6MP/cwv1C7kFE52lA -L9shhjUH1RBYkPr6VO/iZ5FhAAZ2fQm0ap3FyodYcfE --> ssh-ed25519 0/WsKg cAfTjIjq2NMz1mQVZ7Rzv2n+Uliv9STfX7Qk9Ixr8X8 -rFlWd+QGDPGnDRnI4zZEK/QvNrQgZPqRq8Ta1ZNXIbg --> ssh-ed25519 Nl/5yA asEF9vNOohQbne7nsuWo0mjne7JETHTGgXCPp5520m4 -fo745n2zSyLWcadThr53CPizcCw3IRs6MPdGoTz94oQ --> ssh-ed25519 GdLgCQ mUZSVAOzecIr1H8ekf/rrt6LLVxKZG5M3humVl22bww -CuJcm8Qy6TfH6HFJxlfFoOgl2K+4p4bpFSfmEb83wJI --> ssh-ed25519 tOH/HQ AtfEqYQ0aZMT11xRDBNS7vb55weHU4uIV/ztb8JmyCA -esNanLRi1FBWG7v27615uo5CxGW6yvqe/Je/nJ/UVwo --> ssh-ed25519 FpzvfQ MgdTAyCUMNTOOnYD7H0U60IxnOKRUbMO9yfKP1PArgc -/9ia4l8hI+yXb3N1sxTMBhEkkO0BTQRbG4IaGNZuUBs --> ssh-ed25519 kdPvzQ BZGH7Uuor0zXWb7HrzFTKkU9bmZtj6hTYlqggv8EV18 -p+Ix6dd5HqwVoZnliwvr18Tw7LMX/rLHBsyJeOR1Y4Q --> ssh-ed25519 onmXpg zJHDidsIEBbTLWH4EwHdd0kxpp2TKOIMYTTkn30pWWs -ZcoRMNxoJDi1w+ISUw3fRTOi3+NyuCgqVE7k8//UdUs --> ssh-ed25519 CnhD0g 6PMqxrnXVVPavFvgyEEgaj99G8GImfaQIZS6wIs5RQs -1z1plGxfj+Y1WWP46SkArNgHvK3izF3I3UGuLyGG+sA --> ssh-ed25519 4ep2UA +9czZVUs3NAJkZ/E8UDTsk1r95clfNzWkVxcBSNbfS4 -WQ5ZsO2mXPmWz71dX1K0ZJsEbVv4R0QfCSBPPWZ+cSQ ---- xEB5l1RXMXTk7nVXGag3x+jbkLAWzhAlR8CYtiOsfno -KKƷ4k5:Κx6S ;v}6CTg >Ge1TZKBȧ4Ϥ79-Ds>x1l (=3D>;D -gk\7Su:|;>"nw oM{{3 {HB AneGp(*3(B %jt_!TGT o4pk͖Tr Iұ)*.!R]H9v \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 76c4d72..9f48d29 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -94,10 +94,8 @@ in "gitlab/jeremiah-runner-reg.age".publicKeys = everyone; "gitlab/isaiah-qemu-runner-reg.age".publicKeys = everyone; "gitlab/isaiah-vbox-runner-reg.age".publicKeys = everyone; - "gitlab/isaiah-podman-runner-reg.age".publicKeys = everyone; "gitlab/isaiah-shell-runner-reg.age".publicKeys = everyone; "gitlab/linode-deployer-runner-reg.age".publicKeys = everyone; - "gitlab/docker-auth.age".publicKeys = everyone; "acme_password.age".publicKeys = everyone; "ca/intermediate_key.age".publicKeys = everyone;