From 7f885a629777641c403a21274db78bb12061acb0 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 26 May 2025 21:51:56 +0200 Subject: [PATCH] Enable forgejo on alto --- hosts/alto/default.nix | 9 +++++++++ hosts/alto/secrets.yaml | 13 +++++-------- modules/system/forgejo/default.nix | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/hosts/alto/default.nix b/hosts/alto/default.nix index 466629b..1fe71db 100644 --- a/hosts/alto/default.nix +++ b/hosts/alto/default.nix @@ -29,6 +29,10 @@ in subdomain = "budget"; inherit (myConfig.actualbudget) port; }; + forgejo = { + subdomain = "git"; + inherit (myConfig.forgejo) port; + }; }; }; @@ -42,6 +46,11 @@ in inherit (caddyServe.actualbudget) subdomain; backups.enable = true; }; + forgejo = { + enable = true; + inherit (caddyServe.forgejo) subdomain; + }; + syncthing = { enable = true; deviceId = "5R2MH7T-Q2ZZS2P-ZMSQ2UJ-B6VBHES-XYLNMZ6-7FYC27L-4P7MGJ2-FY4ITQD"; diff --git a/hosts/alto/secrets.yaml b/hosts/alto/secrets.yaml index 6a77a39..3ec957a 100644 --- a/hosts/alto/secrets.yaml +++ b/hosts/alto/secrets.yaml @@ -5,15 +5,13 @@ nextcloud: admin-password: ENC[AES256_GCM,data:TepYe5rZox6aoa3jeIhmBxaZIQGpjjf+SAG8E39y,iv:cAanc3a5e3PF+BkiFjcME+PiTSRaNj/e78kT/RTbaxY=,tag:wbn4vWeDnSJH7jWu7hutVw==,type:str] hedgedoc: seb-password: ENC[AES256_GCM,data:+pejm+Ju9l1jqY/8gpWRR6I5z3VEFzPxzw==,iv:0ji6ayKljy7LoZW423xcMmKJqsbon3JGzEb8KlbR2zs=,tag:sz8Szb8wA00U9Es0q0N/tw==,type:str] +forgejo: + admin-password: ENC[AES256_GCM,data:opuQpLrpwkoaRLPmllMrnf1PXTPc1KvJLw==,iv:mfxM8XpQJvAYjKq+rCUhrg+OAaEre1KLayNgH9t4BvM=,tag:5IPFlI1T+j1lxvoPoHBMrQ==,type:str] restic: environment: ENC[AES256_GCM,data:v1Ui5mG7Q98CFEpq7sSpzEf86cJAcRi+sqFdvy6ZPuY9dukJD2wAGt5fuNQkMzBCKAUTHb46ga1WYf9fZ5AUOPdA1MNrJWKrXlrsYh8ZJYKOgfEVBBYPUKKGcajILNQ5SzU=,iv:Asg4CWJbGqSZh8YaxcWA0Yxau1dE4ZV9JBJSiDHufGI=,tag:46pNMWoCbciEv4cIHo7KFQ==,type:str] password: ENC[AES256_GCM,data:NVeqrWqtdgbhu3U7dAgwFeNLS9oPtnAPSrkGtvYD,iv:3l+9+bZfOpZdSCBKzXn5PqJvqo7mz/rj1tkihJqMHIs=,tag:JXigRR1adGlm8ehRv5wzIA==,type:str] healthchecks-ping-key: ENC[AES256_GCM,data:Cbk04CrYd9WcHnVRUed9aIImHbULhA==,iv:70cOOk5LfYciBx5baftFiBuquXY2welnjhoYmIB1iAQ=,tag:I5hqoai/HLdqUqonK77ubA==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1mpq8m4p7dnxh5ze3fh7etd2k6sp85zdnmp9te3e9chcw4pw07pcq960zh5 enc: | @@ -33,8 +31,7 @@ sops: dEhnSkQ5SDlnbmhGSVdYaDNuc3ZkM00K7WPEZRYWAd7uGY0IcDwGgQVPrpkF/tnz ncj03JXM4BXwvEQOmD/i6wS4U4WCwkh9EauGJljVFTeu6TciomDULQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-05-18T17:19:37Z" - mac: ENC[AES256_GCM,data:Z+mPKBUj8FmY21crUs/2A9UUeMoBnWGoJuLcEP8atFZb+58LG5q+nbbsY0pCmpONldl29YAXs+lF5U5npPDVv2qr1jRql+LtAwLfkIYwDw2bmtAdcG1jWQWRgmUr1yloXzceB3Rv1l7ULbw0CJPkZbov2mosEFZFcHKnYbXp/jg=,iv:OepfEZh31s/AYHvg8s0IlW0Zi97BzZudwMGhB5EN4JM=,tag:wruPqU3qVU14dbOAArATCA==,type:str] - pgp: [] + lastmodified: "2025-05-26T18:22:58Z" + mac: ENC[AES256_GCM,data:e7flwIEUUY2aZw4Uxn2YsIAvYpXIqn7Td3DFHutdxSClsTeg98bFXnQwYVqG5eI4S+/z+4C3EVXsI3XIKEvleyefBopvNPy3TSrooAd2ckVJFS51YMqVuz7QV/QX7loNHtT1GTWceSVkIFFKeC1FBsOffHhwVyduR40C4Ok3CWY=,iv:wPC+DyiBaergNoH495kmmSO9meZTB0i4D8lQkAWMBe8=,tag:gyGBh1kISbOaLvrTupofSw==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.4 + version: 3.10.2 diff --git a/modules/system/forgejo/default.nix b/modules/system/forgejo/default.nix index 8e324a0..c024bd4 100644 --- a/modules/system/forgejo/default.nix +++ b/modules/system/forgejo/default.nix @@ -42,6 +42,6 @@ in createCmd = "${lib.getExe config.services.forgejo.package} admin user create"; passwordPath = config.sops.secrets."forgejo/admin-password".path; in - ''${createCmd} --username seb --password "$(cat ${passwordPath})" --email "sebastian.stork@pm.me" --admin || true''; + ''${createCmd} --username SebastianStork --password "$(cat ${passwordPath})" --email "sebastian.stork@pm.me" --admin || true''; }; }