diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-10-18 14:46:47 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-10-18 14:46:47 -0700 |
| commit | d09952fcd5ae3b73ea91f0f308527f70c0dc5c21 (patch) | |
| tree | 08a570d4da8fd6c15285b461d3df6b283c477226 /machines/nixos/x86_64-linux/synology-vm | |
| parent | configure wireguard for rivendell (diff) | |
| download | infra-d09952fcd5ae3b73ea91f0f308527f70c0dc5c21.tar.gz | |
move keycloak and forgejo on rivendell
I had to rekey all the secrets. Updated the documentation for both how
to setup forgejo and keycloak.
Diffstat (limited to '')
| -rw-r--r-- | machines/nixos/x86_64-linux/synology-vm/default.nix | 2 | ||||
| -rw-r--r-- | profiles/forgejo.nix (renamed from machines/nixos/x86_64-linux/synology-vm/profiles/forgejo.nix) | 38 | ||||
| -rw-r--r-- | profiles/keycloak.nix (renamed from machines/nixos/x86_64-linux/synology-vm/profiles/keycloak.nix) | 5 |
3 files changed, 18 insertions, 27 deletions
diff --git a/machines/nixos/x86_64-linux/synology-vm/default.nix b/machines/nixos/x86_64-linux/synology-vm/default.nix index d04a44a..915d851 100644 --- a/machines/nixos/x86_64-linux/synology-vm/default.nix +++ b/machines/nixos/x86_64-linux/synology-vm/default.nix @@ -9,8 +9,6 @@ ./disks.nix ./hardware.nix ./secrets.nix - ./profiles/forgejo.nix - ./profiles/keycloak.nix ./profiles/goget.nix ]; diff --git a/machines/nixos/x86_64-linux/synology-vm/profiles/forgejo.nix b/profiles/forgejo.nix index 18d6207..70af185 100644 --- a/machines/nixos/x86_64-linux/synology-vm/profiles/forgejo.nix +++ b/profiles/forgejo.nix @@ -1,9 +1,4 @@ -{ - self, - config, - pkgs, - ... -}: +{ config, pkgs, ... }: let # convenience wrapper for admin commands forgejo-admin = pkgs.writeShellScriptBin "forgejo-admin" '' @@ -14,7 +9,7 @@ in networking.firewall.allowedTCPPorts = [ 3000 ]; age.secrets.forgejo-fastmail = { - file = "${self}/secrets/forgejo-fastmail.age"; + file = ../secrets/forgejo-fastmail.age; }; environment.systemPackages = [ forgejo-admin ]; @@ -41,7 +36,6 @@ in DOMAIN = "code.fcuny.net"; ROOT_URL = "https://code.fcuny.net"; HTTP_PORT = 3000; - HTTP_ADDR = "10.100.0.40"; LANDING_PAGE = "explore"; }; mailer = { @@ -93,18 +87,18 @@ in }; }; - my.modules.backups = { - local.paths = [ "/var/lib/forgejo" ]; - local.exclude = [ - "/var/lib/forgejo/data/indexers" - "/var/lib/forgejo/data/repo-archive" - "/var/lib/forgejo/data/tmp" - ]; - remote.paths = [ "/var/lib/forgejo" ]; - remote.exclude = [ - "/var/lib/forgejo/data/indexers" - "/var/lib/forgejo/data/repo-archive" - "/var/lib/forgejo/data/tmp" - ]; - }; + # my.modules.backups = { + # local.paths = [ "/var/lib/forgejo" ]; + # local.exclude = [ + # "/var/lib/forgejo/data/indexers" + # "/var/lib/forgejo/data/repo-archive" + # "/var/lib/forgejo/data/tmp" + # ]; + # remote.paths = [ "/var/lib/forgejo" ]; + # remote.exclude = [ + # "/var/lib/forgejo/data/indexers" + # "/var/lib/forgejo/data/repo-archive" + # "/var/lib/forgejo/data/tmp" + # ]; + # }; } diff --git a/machines/nixos/x86_64-linux/synology-vm/profiles/keycloak.nix b/profiles/keycloak.nix index b6fb6c3..7aac133 100644 --- a/machines/nixos/x86_64-linux/synology-vm/profiles/keycloak.nix +++ b/profiles/keycloak.nix @@ -1,7 +1,7 @@ -{ config, self, ... }: +{ config, ... }: { age.secrets.keycloak-db-password = { - file = "${self}/secrets/keycloak-db-password.age"; + file = ../secrets/keycloak-db-password.age; }; networking.firewall.allowedTCPPorts = [ 8080 ]; @@ -11,7 +11,6 @@ database.passwordFile = config.age.secrets.keycloak-db-password.path; settings = { hostname = "id.fcuny.net"; - http-host = "10.100.0.40"; http-port = 8080; proxy-headers = "xforwarded"; http-enabled = true; |