clan/clan-infra
10
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

treefmt
All checks were successful
build / test (push) Successful in 1m15s
Details

Browse Source
This commit is contained in:
Jörg Thalheim 2023-07-13 11:29:21 +02:00
parent 6d22fd0c35
commit fd0b984d61
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/web01/gitea/actions-runner.nix
View File

@ -2,7 +2,8 @@
let
inherit (self.packages.${pkgs.hostPlatform.system}) actions-runner;
in {
in
{
systemd.services.gitea-actions-runner-nix-image = {
wantedBy = [ "multi-user.target" ];
script = ''
@ -39,12 +40,12 @@ in {
virtualisation.podman.enable = true;
systemd.services.gitea-runner-nix = {
after = [
after = [
"gitea-actions-runner-nix-token.service"
"gitea-actions-runner-nix-image.service"
];
requires = [
"gitea-actions-runner-nix-token.service"
requires = [
"gitea-actions-runner-nix-token.service"
"gitea-actions-runner-nix-image.service"
];
};

4
pkgs/zerotier-tcp-proxy.nix
View File

@ -9,8 +9,8 @@ stdenv.mkDerivation {
};
patches = [
(fetchpatch {
url = "https://github.com/zerotier/ZeroTierOne/commit/dd2006d494e85a41d8b818b37460e7cf458a2aee.patch";
hash = "sha256-nuao04pDha7h62RHviUZYx21p6bNOyiU78kBBq2o2Rs=";
url = "https://github.com/zerotier/ZeroTierOne/commit/dd2006d494e85a41d8b818b37460e7cf458a2aee.patch";
hash = "sha256-nuao04pDha7h62RHviUZYx21p6bNOyiU78kBBq2o2Rs=";
})
];
buildPhase = ''

4
pkgs/zt-tcp-relay.nix
View File

@ -18,8 +18,8 @@ rustPlatform.buildRustPackage {
patches = [
# https://github.com/alexander-akhmetov/zt-tcp-relay/pull/19
(fetchpatch {
url = "https://github.com/alexander-akhmetov/zt-tcp-relay/commit/69f0a4f1f210dcd7a305036d4737d9a29215824d.patch";
hash = "sha256-kqZS9IjwEggLE6CQFaacL2TyTUn0PQCz1TPdoZdDrk0=";
url = "https://github.com/alexander-akhmetov/zt-tcp-relay/commit/69f0a4f1f210dcd7a305036d4737d9a29215824d.patch";
hash = "sha256-kqZS9IjwEggLE6CQFaacL2TyTUn0PQCz1TPdoZdDrk0=";
})
];

2
terraform/web01/dns.tf
View File

@ -86,7 +86,7 @@ resource "netlify_dns_record" "dkim" {
hostname = "v1._domainkey.${var.domain}"
type = "TXT"
# take from `systemctl status opendkim`
value = "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTFSkQcM0v6mC4kiWEoF/EgK/hPVgOBJlHesLVIe+8BmidylaUowKlyC2gECipXhoVX9++OfMFAKNtGrIJcCTVNH/DRGkhbHLSxzzXijCbJ7G/fjpHRifpxMydEmybQDKdidR44YMR74Aj0OwUEgu+N/yJZ2+ubOlstW0fZJaJwQIDAQAB"
value = "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTFSkQcM0v6mC4kiWEoF/EgK/hPVgOBJlHesLVIe+8BmidylaUowKlyC2gECipXhoVX9++OfMFAKNtGrIJcCTVNH/DRGkhbHLSxzzXijCbJ7G/fjpHRifpxMydEmybQDKdidR44YMR74Aj0OwUEgu+N/yJZ2+ubOlstW0fZJaJwQIDAQAB"
}
resource "netlify_dns_record" "adsp" {