feat: move forgejo-runner into own module, fix its networking
All checks were successful
/ check (push) Successful in 14m43s

This commit is contained in:
winston 2024-09-18 19:02:07 +02:00
parent 2da1c15a3f
commit ea4ad43613
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 26 additions and 17 deletions

View file

@ -4,6 +4,7 @@
./atuin.nix
./containers.nix
./forgejo.nix
./forgejo-runner.nix
./freshrss.nix
./geoipupdate.nix
./minio.nix

View file

@ -0,0 +1,25 @@
{ config, pkgs, ... }:
{
networking.firewall.trustedInterfaces = [ "podman+" ];
virtualisation.podman = {
enable = true;
dockerSocket.enable = true;
defaultNetwork.settings = {
dns_enabled = true;
ipv6_enabled = true;
};
};
services.gitea-actions-runner = {
package = pkgs.unstable.forgejo-runner;
instances.main = {
enable = true;
name = "main";
url = config.services.forgejo.settings.server.ROOT_URL;
tokenFile = config.age.secrets."services/forgejo/runner-token".path;
labels = [ "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest" ];
settings.container.options = "--add-host=${config.services.forgejo.settings.server.DOMAIN}:host-gateway";
};
};
}

View file

@ -116,23 +116,6 @@ in
};
};
virtualisation.podman = {
enable = true;
dockerSocket.enable = true;
defaultNetwork.settings.dns_enabled = true;
};
services.gitea-actions-runner = {
package = pkgs.unstable.forgejo-runner;
instances.main = {
enable = true;
name = "main";
url = config.services.forgejo.settings.server.ROOT_URL;
tokenFile = config.age.secrets."services/forgejo/runner-token".path;
labels = [ "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest" ];
settings.container.options = "--add-host=code.winston.sh:host-gateway";
};
};
services.nginx.virtualHosts.${config.services.forgejo.settings.server.DOMAIN} = {
forceSSL = true;
enableACME = false;