Compare commits

...

2 commits

Author SHA1 Message Date
alejandro-angulo 364974f31c
fix: get actions runner working for new personal git server
All checks were successful
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 13s
I had to delete /var/lib/private/gitea-runner in addition to this change
(since I was migrating to a new git server).
2024-10-30 23:08:40 -07:00
alejandro-angulo 01409f7ecb
feat: add git server to tailnet 2024-10-30 23:05:34 -07:00
5 changed files with 36 additions and 19 deletions

Binary file not shown.

View file

@ -7,15 +7,17 @@ let
node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETLBnc8kJokmFiA28BaSYpeE7flY1W0SM5C1pWv/tOv"; node = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIETLBnc8kJokmFiA28BaSYpeE7flY1W0SM5C1pWv/tOv";
pi4 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9fnNXzEmDdmtR+KWj/M9vQioFR0s/4jMnIkUFcj8As"; pi4 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK9fnNXzEmDdmtR+KWj/M9vQioFR0s/4jMnIkUFcj8As";
proxy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAf6Z7SZEOH3H51T/GPIc/B0OpbaydM5l2PP3nMnwpFl"; proxy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAf6Z7SZEOH3H51T/GPIc/B0OpbaydM5l2PP3nMnwpFl";
git = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8JLy/ipBfOet3/KT7rXOXHDjjmt+VqqQb3V+ILIuDN";
}; };
in { in {
"cf_dns_kilonull.age".publicKeys = [users.me machines.node machines.gospel machines.pi4 machines.proxy]; "cf_dns_kilonull.age".publicKeys = [users.me machines.node machines.gospel machines.pi4 machines.proxy];
"nextcloud_admin.age".publicKeys = [users.me machines.node machines.gospel];
"theengs_ble_mqtt.age".publicKeys = [users.me machines.pi4 machines.gospel];
"hass_mqtt.age".publicKeys = [users.me machines.pi4 machines.node machines.gospel];
"teslamate_db.age".publicKeys = [users.me machines.node machines.gospel];
"teslamate_mqtt.age".publicKeys = [users.me machines.pi4 machines.node machines.gospel];
"teslamate_encryption.age".publicKeys = [users.me machines.node machines.gospel];
"hydra-aws-creds.age".publicKeys = [users.me machines.gospel];
"gitea-runner-gospel.age".publicKeys = [users.me machines.gospel]; "gitea-runner-gospel.age".publicKeys = [users.me machines.gospel];
"hass_mqtt.age".publicKeys = [users.me machines.pi4 machines.node machines.gospel];
"hydra-aws-creds.age".publicKeys = [users.me machines.gospel];
"nextcloud_admin.age".publicKeys = [users.me machines.node machines.gospel];
"tailscale_git_server.age".publicKeys = [users.me machines.git]; # This key expires, might have to update
"teslamate_db.age".publicKeys = [users.me machines.node machines.gospel];
"teslamate_encryption.age".publicKeys = [users.me machines.node machines.gospel];
"teslamate_mqtt.age".publicKeys = [users.me machines.pi4 machines.node machines.gospel];
"theengs_ble_mqtt.age".publicKeys = [users.me machines.pi4 machines.gospel];
} }

Binary file not shown.

View file

@ -4,9 +4,12 @@
... ...
}: let }: let
domain = "git.alejandr0angul0.dev"; domain = "git.alejandr0angul0.dev";
secrets = config.age.secrets;
in { in {
imports = ["${inputs.nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix"]; imports = ["${inputs.nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix"];
age.secrets.authKeyFile.file = ../../../secrets/tailscale_git_server.age;
aa = { aa = {
nix.enable = true; nix.enable = true;
@ -17,6 +20,10 @@ in {
services = { services = {
openssh.enable = true; openssh.enable = true;
tailscale = {
enable = true;
configureClientRouting = true;
};
}; };
}; };
@ -25,6 +32,11 @@ in {
enableACME = true; enableACME = true;
}; };
services.tailscale = {
authKeyFile = secrets.authKeyFile.path;
extraUpFlags = ["--ssh"];
};
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults = { defaults = {

View file

@ -76,11 +76,13 @@
}) })
]; ];
services.gitea-actions-runner.instances = { services.gitea-actions-runner = {
package = pkgs.forgejo-runner;
instances = {
gospel = { gospel = {
enable = true; enable = true;
name = config.networking.hostName; name = config.networking.hostName;
url = "https://gitea.kilonull.com"; url = "https://git.alejandr0angul0.dev";
tokenFile = config.age.secrets.gitea-runner-gospel.path; tokenFile = config.age.secrets.gitea-runner-gospel.path;
labels = [ labels = [
"ubuntu-latest:docker://node:16-bullseye" "ubuntu-latest:docker://node:16-bullseye"
@ -90,6 +92,7 @@
]; ];
}; };
}; };
};
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = true;