Run automatic update #299

Merged
github-actions[bot] merged 4 commits from create-pull-request/patch into main 2023-12-08 12:53:59 +00:00
7 changed files with 2 additions and 55 deletions
Showing only changes of commit ad14e2da08 - Show all commits

View file

@ -24,8 +24,6 @@
./services/cups.nix
./services/iscsi.nix
./services/samba.nix
./services/woodpecker.nix
./services/woodpecker-agent.nix
./services/docker.nix
./users/remote-build.nix
./services/kubo-local.nix

View file

@ -18,7 +18,6 @@
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd
./services/postgres.nix
./services/woodpecker-agent.nix
./users/remote-build.nix
];
hardware.cpu.amd.updateMicrocode = true;

View file

@ -141,7 +141,6 @@ in {
}
'';
};
"woodpecker.chir.rs" = mkConfig "https://woodpecker.int.chir.rs";
"moa.chir.rs" = mkConfig "https://moa.int.chir.rs";
"chir.rs" = {
useACMEHost = "chir.rs";

View file

@ -1,22 +0,0 @@
{
config,
pkgs,
lib,
nix-packages,
system,
...
}: {
imports = [./docker.nix];
services.woodpecker-agents.agents.main = {
enable = true;
environment = {
WOODPECKER_SERVER = "woodpecker.int.chir.rs:9000";
WOODPECKER_BACKEND = "docker";
DOCKER_HOST = "unix:///run/docker.sock";
WOODPECKER_MAX_PROCS = toString config.nix.settings.cores;
};
environmentFile = [config.sops.secrets."services/woodpecker-runner".path];
extraGroups = ["docker"];
};
sops.secrets."services/woodpecker-runner" = {};
}

View file

@ -1,25 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
services.woodpecker-server = {
enable = true;
environment = {
WOODPECKER_HOST = "https://woodpecker.chir.rs";
WOODPECKER_SERVER_ADDR = ":47927";
WOODPECKER_ADMIN = "darkkirb";
};
environmentFile = config.sops.secrets."services/woodpecker".path;
};
sops.secrets."services/woodpecker" = {};
services.caddy.virtualHosts."woodpecker.int.chir.rs" = {
useACMEHost = "int.chir.rs";
logFormat = pkgs.lib.mkForce "";
extraConfig = ''
import baseConfig
reverse_proxy http://127.0.0.1:47927
'';
};
}

View file

@ -144,7 +144,7 @@ with dns.lib.combinators; let
SOA = {
nameServer = "ns1.chir.rs.";
adminEmail = "lotte@chir.rs";
serial = 41;
serial = 42;
};
NS = [
"ns1.chir.rs."
@ -235,7 +235,6 @@ with dns.lib.combinators; let
"assets-chir-rs.b-cdn.net."
];
matrix = createZone {};
woodpecker = createZone {};
akko = createZone {};
peertube = createZone {};
mediaproxy.CNAME = ["mediaproxy-chir-rs.b-cdn.net."];

View file

@ -15,7 +15,7 @@ in {
SOA = {
nameServer = "ns1.chir.rs.";
adminEmail = "lotte@chir.rs";
serial = 27;
serial = 28;
};
NS = [
"ns1.chir.rs."
@ -298,7 +298,6 @@ in {
mastodon.CNAME = [(ttl zoneTTL (cname "nas"))];
matrix.CNAME = [(ttl zoneTTL (cname "instance-20221213-1915"))];
rspamd.CNAME = [(ttl zoneTTL (cname "nixos-8gb-fsn1-1"))];
woodpecker.CNAME = [(ttl zoneTTL (cname "nas"))];
moa.CNAME = [(ttl zoneTTL (cname "nas"))];
matrix-admin.CNAME = [(ttl zoneTTL (cname "instance-20221213-1915"))];
mautrix-discord.CNAME = [(ttl zoneTTL (cname "instance-20221213-1915"))];