From f91a46590d78e797d35ee18b455728155770f85e Mon Sep 17 00:00:00 2001 From: buffet Date: Mon, 6 May 2024 16:20:56 +0200 Subject: [PATCH] Revert "feat(forgejo): setup action runner" This reverts commit 999c0a53837ff17517052d73989e82cd6d388e08. --- hosts/ami/forgejo-runner.nix | 218 ----------------------------------- hosts/ami/forgejo.nix | 3 - 2 files changed, 221 deletions(-) delete mode 100644 hosts/ami/forgejo-runner.nix diff --git a/hosts/ami/forgejo-runner.nix b/hosts/ami/forgejo-runner.nix deleted file mode 100644 index 4f15780..0000000 --- a/hosts/ami/forgejo-runner.nix +++ /dev/null @@ -1,218 +0,0 @@ -# based on https://git.clan.lol/clan/clan-infra/src/commit/3aa2c92d9869d8055b1b38478f4ba1d56a8fa979/modules/web01/gitea/actions-runner.nix -# Copyright 2023 Clan contributers -# -# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -{ - config, - self, - pkgs, - lib, - ... -}: let - storeDeps = pkgs.runCommand "store-deps" {} '' - mkdir -p $out/bin - for dir in ${toString [pkgs.coreutils pkgs.findutils pkgs.gnugrep pkgs.gawk pkgs.git pkgs.nix pkgs.bash pkgs.jq pkgs.nodejs]}; do - for bin in "$dir"/bin/*; do - ln -s "$bin" "$out/bin/$(basename "$bin")" - done - done - - # Add SSL CA certs - mkdir -p $out/etc/ssl/certs - cp -a "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" $out/etc/ssl/certs/ca-bundle.crt - ''; - numInstances = 2; -in - lib.mkMerge [ - { - # everything here has no dependencies on the store - systemd.services.gitea-runner-nix-image = { - wantedBy = ["multi-user.target"]; - after = ["podman.service"]; - requires = ["podman.service"]; - path = [config.virtualisation.podman.package pkgs.gnutar pkgs.shadow pkgs.getent]; - # we also include etc here because the cleanup job also wants the nixuser to be present - script = '' - set -eux -o pipefail - mkdir -p etc/nix - - # Create an unpriveleged user that we can use also without the run-as-user.sh script - touch etc/passwd etc/group - groupid=$(cut -d: -f3 < <(getent group nixuser)) - userid=$(cut -d: -f3 < <(getent passwd nixuser)) - groupadd --prefix $(pwd) --gid "$groupid" nixuser - emptypassword='$6$1ero.LwbisiU.h3D$GGmnmECbPotJoPQ5eoSTD6tTjKnSWZcjHoVTkxFLZP17W9hRi/XkmCiAMOfWruUwy8gMjINrBMNODc7cYEo4K.' - useradd --prefix $(pwd) -p "$emptypassword" -m -d /tmp -u "$userid" -g "$groupid" -G nixuser nixuser - - cat < etc/nix/nix.conf - accept-flake-config = true - experimental-features = nix-command flakes - NIX_CONFIG - - cat < etc/nsswitch.conf - passwd: files mymachines systemd - group: files mymachines systemd - shadow: files - - hosts: files mymachines dns myhostname - networks: files - - ethers: files - services: files - protocols: files - rpc: files - NSSWITCH - - # list the content as it will be imported into the container - tar -cv . | tar -tvf - - tar -cv . | podman import - forgejo-runner-nix - ''; - serviceConfig = { - RuntimeDirectory = "forgejo-runner-nix-image"; - WorkingDirectory = "/run/forgejo-runner-nix-image"; - Type = "oneshot"; - RemainAfterExit = true; - }; - }; - - users.users.nixuser = { - group = "nixuser"; - description = "Used for running nix ci jobs"; - home = "/var/empty"; - isSystemUser = true; - }; - users.groups.nixuser = {}; - } - { - systemd.services = lib.genAttrs (builtins.genList (n: "forgejo-runner-nix${builtins.toString n}-token") numInstances) (name: { - wantedBy = ["multi-user.target"]; - after = ["forgejo.service"]; - environment = { - GITEA_CUSTOM = config.services.forgejo.customDir; - GITEA_WORK_DIR = config.services.forgejo.stateDir; - }; - script = '' - set -euo pipefail - token=$(${lib.getExe pkgs.forgejo} actions generate-runner-token) - echo "TOKEN=$token" > /var/lib/forgejo-registration/${name} - ''; - unitConfig.ConditionPathExists = ["!/var/lib/forgejo-registration/${name}"]; - serviceConfig = { - User = "forgejo"; - Group = "forgejo"; - StateDirectory = "forgejo-registration"; - Type = "oneshot"; - RemainAfterExit = true; - }; - }); - - # Format of the token file: - virtualisation.podman.enable = true; - } - { - systemd.services = lib.genAttrs (builtins.genList (n: "forgejo-runner-nix${builtins.toString n}") numInstances) (name: { - after = [ - "${name}-token.service" - "forgejo-runner-nix-image.service" - ]; - requires = [ - "${name}-token.service" - "forgejo-runner-nix-image.service" - ]; - - # TODO: systemd confinment - serviceConfig = { - # Hardening (may overlap with DynamicUser=) - # The following options are only for optimizing output of systemd-analyze - AmbientCapabilities = ""; - CapabilityBoundingSet = ""; - # ProtectClock= adds DeviceAllow=char-rtc r - DeviceAllow = ""; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - UMask = "0066"; - ProtectProc = "invisible"; - SystemCallFilter = [ - "~@clock" - "~@cpu-emulation" - "~@module" - "~@mount" - "~@obsolete" - "~@raw-io" - "~@reboot" - "~@swap" - # needed by go? - #"~@resources" - "~@privileged" - "~capset" - "~setdomainname" - "~sethostname" - ]; - RestrictAddressFamilies = ["AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK"]; - - # Needs network access - PrivateNetwork = false; - # Cannot be true due to Node - MemoryDenyWriteExecute = false; - - # The more restrictive "pid" option makes `nix` commands in CI emit - # "GC Warning: Couldn't read /proc/stat" - # You may want to set this to "pid" if not using `nix` commands - ProcSubset = "all"; - # Coverage programs for compiled code such as `cargo-tarpaulin` disable - # ASLR (address space layout randomization) which requires the - # `personality` syscall - # You may want to set this to `true` if not using coverage tooling on - # compiled code - LockPersonality = false; - - # Note that this has some interactions with the User setting; so you may - # want to consult the systemd docs if using both. - DynamicUser = true; - }; - }); - - services.gitea-actions-runner.instances = lib.genAttrs (builtins.genList (n: "nix${builtins.toString n}") numInstances) (name: { - enable = true; - name = "nix-runner"; - # take the git root url from the forgejo config - # only possible if you've also configured your forgejo though the same nix config - # otherwise you need to set it manually - url = config.services.forgejo.settings.server.ROOT_URL; - # use your favourite nix secret manager to get a path for this - tokenFile = "/var/lib/forgejo-registration/forgejo-runner-${name}-token"; - labels = ["nix:docker://forgejo-runner-nix"]; - settings = { - container = { - options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nixuser --device=/dev/kvm"; - # the default network that also respects our dns server settings - network = "host"; - valid_volumes = [ - "/nix" - "${storeDeps}/bin" - "${storeDeps}/etc/ssl" - ]; - }; - }; - }); - } - ] diff --git a/hosts/ami/forgejo.nix b/hosts/ami/forgejo.nix index 78893ea..54c9889 100644 --- a/hosts/ami/forgejo.nix +++ b/hosts/ami/forgejo.nix @@ -1,9 +1,6 @@ {pkgs, ...}: let port = 3000; in { - imports = [ - ./forgejo-runner.nix - ]; services = { forgejo = { enable = true;