From 6cea499758154d12beed728023dee49041fd718d Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 2 Jun 2023 13:36:44 +0200 Subject: [PATCH] rename woodpecker to ci --- nixos/hosts/hades/garage/configuration.nix | 1 - .../{woodpecker => ci}/configuration.nix | 32 ------------------- nixos/hosts/olympus/default.nix | 6 +--- 3 files changed, 1 insertion(+), 38 deletions(-) rename nixos/hosts/olympus/{woodpecker => ci}/configuration.nix (67%) diff --git a/nixos/hosts/hades/garage/configuration.nix b/nixos/hosts/hades/garage/configuration.nix index 00047f9..a1e52a1 100644 --- a/nixos/hosts/hades/garage/configuration.nix +++ b/nixos/hosts/hades/garage/configuration.nix @@ -25,7 +25,6 @@ in { # Defines rpc_secret systemd.services.garage.serviceConfig.EnvironmentFile = "${vs.garage}/environment"; - # See also: https://github.com/NixOS/nixpkgs/tree/master/nixos/tests/garage services.garage = { enable = true; package = pkgs.garage_0_8; diff --git a/nixos/hosts/olympus/woodpecker/configuration.nix b/nixos/hosts/olympus/ci/configuration.nix similarity index 67% rename from nixos/hosts/olympus/woodpecker/configuration.nix rename to nixos/hosts/olympus/ci/configuration.nix index e7eede9..75fc957 100644 --- a/nixos/hosts/olympus/woodpecker/configuration.nix +++ b/nixos/hosts/olympus/ci/configuration.nix @@ -22,11 +22,6 @@ in { networking.firewall.allowedTCPPorts = [ port 9000 ]; - vault-secrets.secrets.woodpecker = { - services = [ "woodpecker-server" "woodpecker-agent-docker" ]; - quoteEnvironmentValues = false; # Needed for docker - }; - vault-secrets.secrets.gitea_runner = { services = [ "gitea-runner-nix\x2dnative" ]; }; @@ -72,31 +67,4 @@ in { ]; }; }; - - services.woodpecker-server = { - enable = true; - environment = { - WOODPECKER_OPEN = "true"; - WOODPECKER_HOST = "https://ci.0x76.dev"; - WOODPECKER_GITEA = "true"; - WOODPECKER_GITEA_URL = "https://git.0x76.dev"; - WOODPECKER_ADMIN = "v"; - WOODPECKER_AUTHENTICATE_PUBLIC_REPOS = "true"; - WOODPECKER_SERVER_ADDR = "10.42.42.33:${toString port}"; - }; - environmentFile = "${vs.woodpecker}/environment"; - }; - - services.woodpecker-agents.agents = { - docker = { - enable = true; - environment = { - DOCKER_HOST = "unix:///run/podman/podman.sock"; - WOODPECKER_BACKEND = "docker"; - WOODPECKER_SERVER = "localhost:9000"; - }; - environmentFile = [ "${vs.woodpecker}/environment" ]; - extraGroups = [ "podman" ]; - }; - }; } diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix index 8bce28e..07f1f36 100644 --- a/nixos/hosts/olympus/default.nix +++ b/nixos/hosts/olympus/default.nix @@ -180,13 +180,9 @@ mac = "7A:17:9E:80:72:01"; exposes.ntfy.domain = "ntfy.0x76.dev"; }; - "woodpecker" = { + "ci" = { ip = "10.42.42.33"; mac = "1E:24:DA:DB:4A:1A"; - exposes.ci = { - domain = "ci.0x76.dev"; - port = 8000; - }; }; "nuc" = { ip = "10.42.42.42";