Compare commits

..

No commits in common. "9eea38d0006aca69c224368e21d09395eac2985f" and "0fb831b03d3405c448da81b8ab7ee30e9c4539eb" have entirely different histories.

4 changed files with 22 additions and 48 deletions

View file

@ -4,6 +4,7 @@
config, config,
... ...
}: { }: {
sops.secrets.forgejo-runner-token = {owner = "forgejo";};
services.forgejo = { services.forgejo = {
enable = true; enable = true;
stateDir = "/var/lib/forgejo"; stateDir = "/var/lib/forgejo";
@ -42,4 +43,25 @@
}; };
}; };
}; };
services.gitea-actions-runner = {
package = pkgs.forgejo-actions-runner;
instances.main = {
enable = true;
name = config.networking.hostName;
url = "https://git.flake.sh";
token = config.sops.secrets.forgejo-runner-token.path;
labels = [
"debian-latest:docker://node:18-bullseye"
"ubuntu-latest:docker://node:18-bullseye"
#"native:host"
];
hostPackages = with pkgs; [
bash
curl
coreutils
wget
gitMinimal
];
};
};
} }

View file

@ -12,16 +12,6 @@
services.traefik = { services.traefik = {
enable = true; enable = true;
dynamicConfigOptions = { dynamicConfigOptions = {
tcp = {
routers = {
gitssh = {
rule = "HostSNI(`*`)";
entrypoints = ["gitssh"];
service = "gitssh";
tls.passthrough = true;
};
};
};
http = { http = {
middlewares.authelia = { middlewares.authelia = {
forwardauth = { forwardauth = {
@ -117,7 +107,6 @@
grafana.loadBalancer.servers = [{url = "http://100.121.201.47:3100";}]; grafana.loadBalancer.servers = [{url = "http://100.121.201.47:3100";}];
hedgedoc.loadBalancer.servers = [{url = "http://100.121.201.47:3300";}]; hedgedoc.loadBalancer.servers = [{url = "http://100.121.201.47:3300";}];
vaultwarden.loadBalancer.servers = [{url = "http://100.121.201.47:8222";}]; vaultwarden.loadBalancer.servers = [{url = "http://100.121.201.47:8222";}];
gitssh.loadBalancer.servers = [{url = "tcp://100.121.201.47:2222";}];
}; };
}; };
}; };
@ -136,9 +125,6 @@
web = { web = {
address = ":80"; address = ":80";
}; };
gitssh = {
address = ":2222";
};
}; };
metrics = { metrics = {
prometheus = { prometheus = {

View file

@ -8,6 +8,5 @@
./dashdot.nix ./dashdot.nix
./jellyfin.nix ./jellyfin.nix
./neko.nix ./neko.nix
./forgejo-runners.nix
]; ];
} }

View file

@ -1,33 +0,0 @@
{
pkgs,
config,
...
}: {
sops.secrets.forgejo-runner-token = {};
services.gitea-actions-runner = {
package = pkgs.forgejo-actions-runner;
instances.main = {
settings = {
container = {
network = "host";
};
};
enable = true;
name = config.networking.hostName;
url = "https://git.flake.sh";
token = "gdeEbeUTifa1nK7EfRgBmvm6XRdQE1zZzAatBRSC";
labels = [
"debian-latest:docker://node:18-bullseye"
"ubuntu-latest:docker://node:18-bullseye"
#"native:host"
];
hostPackages = with pkgs; [
bash
curl
coreutils
wget
gitMinimal
];
};
};
}