arch/infra
arch/infra
1
0
Fork 0
Code Actions Packages Activity

Compare commits

base: arch:4a25ea708e1db466b1e23f840ad6d5dabb5771a9
Branches Tags
arch:trunk
arch:woodpecker-ci
...
compare: arch:3ab2dec4aed017c86d3ba5719b067ce1e65a695f
Branches Tags
arch:trunk
arch:woodpecker-ci

2 commits
4a25ea708e ... 3ab2dec4ae

Author SHA1 Message Date
Gabriel Simmer 3ab2dec4ae
Minor tweaks to gitea runners
All checks were successful
Lint / lint (push) Successful in 9s
Details
2023-07-19 11:59:28 +01:00
Gabriel Simmer 7a9c0d4ff8
Sync terraform state with config, update Vercel provider 2023-07-19 11:58:50 +01:00
5 changed files with 53 additions and 39 deletions
Show stats Expand all files Collapse all files

4
krops/nas/configuration.nix
View file

@ -153,6 +153,9 @@
actions = {
ENABLED = true;
};
federation = {
ENABLED = true;
};
};
};
gitea-actions-runner = {
@ -162,6 +165,7 @@
enable = true;
labels = [
"debian-latest:docker://node:18-bullseye"
"nix:docker://nixos/nix"
];
url = "https://vancouver.scorpion-ghost.ts.net/git";
token = "";

39
krops/oracle-gitea-runner/configuration.nix
View file

@ -10,6 +10,7 @@
zramSwap.enable = true;
networking.hostName = "gitea-arm-runner";
networking.domain = "gmem.ca";
networking.nameservers = [ "1.1.1.1" "1.0.0.1" ];
environment.systemPackages = with pkgs; [
vim
wget
@ -19,19 +20,31 @@
];
services.gitea-actions-runner = {
instances = {
oracle-arm = {
name = "oracle-arm";
enable = true;
labels = [
"debian-latest-arm:docker://node:18-bullseye"
"arm:host"
];
url = "https://vancouver.scorpion-ghost.ts.net/git";
token = "";
};
instances = {
oracle-arm = {
name = "oracle-arm";
enable = true;
labels = [
"debian-latest-arm:docker://node:18-bullseye"
"arm:host"
];
hostPackages = with pkgs; [
bash
coreutils
curl
gawk
gitMinimal
gnused
nodejs
wget
docker
nix
];
url = "https://vancouver.scorpion-ghost.ts.net/git";
token = "";
};
};
};
programs.zsh.enable = true;
programs.fish.enable = true;
@ -45,10 +58,6 @@
virtualisation = {
docker = {
enable = true;
rootless = {
enable = true;
setSocketVariable = true;
};
};
};

34
terraform/.terraform.lock.hcl
View file

@ -66,24 +66,24 @@ provider "registry.terraform.io/hetznercloud/hcloud" {
}
provider "registry.terraform.io/vercel/vercel" {
version = "0.8.0"
constraints = "~> 0.3"
version = "0.14.0"
constraints = "0.14.0"
hashes = [
"h1:Kzse18BqhCTIWpNKP9KZHu4zPwKGKxlYj/n7szNV8nc=",
"zh:11631b0d2459692f2f1c3c61d3344c87580a2f620bb4484c1716797bf2a48f76",
"zh:1c1de1469e2b1f2d6cd94c30bd085f4dc05a893f551a654741617bb2a7e92740",
"zh:28261a2f5c9d18a5975bbdc8610d10847cbb95e6ec722f02a8787a021ec02364",
"zh:30c5d1f42e6e1a0946653e7a452e9630f3bcf55b9780bb70b9fbaf4d8dead2cf",
"zh:33476f430bd1c6c8d65944dc77f20fb2084ab76139a9b9c99bd17963f737ce93",
"zh:5572fe75e079daa2f9895e5b3e5fcd358d3072c7ba9ffd2db7becb34c72ce1d4",
"zh:58e8d03968df4c93cd006ce771435a420d48a8cfb4744506098bb40b4016b8fa",
"zh:6141ab26e096a339b7e55955f24ad6f484bfbead81f31d3e19125ab9817133f3",
"zh:88faf1399d1b603acd950a34d401d5b50fd28e407d83b31e4cb6a16473fb5523",
"zh:96e66219851d9b0ffbc395ee22455d59b1e746278a6cfa040a641132045670bf",
"zh:a723d012d88eefc28cf8e9a2901d255c7ec815643d037a2eebd02624b1841c75",
"zh:b9e43cba95517ca7fe2970c91e1fd37a6a2ab031d0237a27efe738a8f2f3190f",
"zh:bff70b81b4544fc4ba686bcbfb82ae69477f822d1b9de69c854a1d4b1bae62bb",
"h1:CxbU8szze0UZHnkqYQAp+kygQCVLhzWrcO0Fpp0MgAc=",
"zh:1620b262e046dabca452c5099d4eea8ce7920789c49e808b6c82ab8e21e677d6",
"zh:3f6b04526615585e5e2c65908f7082d166b6c4102cee1ef924d62e2941cd47e9",
"zh:4ed098aafdf4e252515f180671981d2d60ae6a6be02e9312787e23d66320635b",
"zh:56d14ae6c4cdb17279b220e4122e520428c974c6387b5a29eb175ee02374b565",
"zh:5d3f1f8282c197c7f5a94eacb0f5a5d578f786b04ff7978743ef8106b6868d96",
"zh:5e85857b69cd57864bfd386c8ca111e72dd8e39c7c83ccc9d166dcba351c2474",
"zh:7192e2977d832691b60d68d300b3652bd813d5ace9a463cf34c410c4543d3cae",
"zh:809c20333528f26014b020e4bc3fe16947fc1168c6e8778bba384a48690b56e2",
"zh:9802749e03e2233bd34a556818e71cf1a4159bd6fc6c0ab05dd456305c11b421",
"zh:9bf863e0341e418b3978c00db6e593c5dda2aaf42f0b310f42f3ba1fabce2c46",
"zh:c66201379984266883549cb31c2229de4511cec4046be8a5376c21249a350a3a",
"zh:ce61413c6c7b6ad75b1427b6a749f6236fdb37319135f7389981cfc53dc34e35",
"zh:ead2367b54dc21081deca7b53c0ef411b19b77645ca9e947f1fc420141fa11a4",
"zh:f26e0763dbe6a6b2195c94b44696f2110f7f55433dc142839be16b9697fa5597",
"zh:f342bc110b108dd081926831bf71b063790a9ac12a9385d7e44dfd40b1b0b1eb",
"zh:fb1f224246a5b8282eb1721efd48e296947cc19f4bc8cb72fcb29fbe841c9953",
]
}

13
terraform/gmem.ca.tf
View file

@ -180,7 +180,8 @@ resource "aws_cloudfront_distribution" "gmem-ca-s3_distribution" {
connection_attempts = 3
connection_timeout = 10
domain_name = "8vs70xammd.execute-api.eu-west-2.amazonaws.com"
origin_id = "8vs70xammd.execute-api.eu-west-2.amazonaws.com"
origin_id = "8vs70xammd.execute-api.eu-west-2.amazonaws.com"
origin_path = "/default"
custom_origin_config {
http_port = 80
@ -208,7 +209,7 @@ resource "aws_cloudfront_distribution" "gmem-ca-s3_distribution" {
response_headers_policy_id = "60669652-455b-4ae9-85a4-c4c02393f86c"
forwarded_values {
query_string = false
query_string = true
cookies {
forward = "none"
@ -222,17 +223,17 @@ resource "aws_cloudfront_distribution" "gmem-ca-s3_distribution" {
}
ordered_cache_behavior {
path_pattern = "/.well-known/webfinger*"
path_pattern = "/.well-known/webfinger"
allowed_methods = ["GET", "HEAD", "OPTIONS"]
cached_methods = ["GET", "HEAD", "OPTIONS"]
target_origin_id = "8vs70xammd.execute-api.eu-west-2.amazonaws.com"
target_origin_id = "8vs70xammd.execute-api.eu-west-2.amazonaws.com"
compress = true
forwarded_values {
query_string = true
headers = ["Origin", "Accept", "Content-Type"]
cookies {
forward = "all"
forward = "none"
}
}

2
terraform/main.tf
View file

@ -2,7 +2,7 @@ terraform {
required_providers {
vercel = {
source = "vercel/vercel"
version = "~> 0.3"
version = "0.14.0"
}
aws = {
source = "hashicorp/aws"