diff --git a/hosts/nimbus/configuration.nix b/hosts/nimbus/configuration.nix index 7200217..e8e7af2 100644 --- a/hosts/nimbus/configuration.nix +++ b/hosts/nimbus/configuration.nix @@ -13,6 +13,7 @@ ../../modules/nixos/tailscale.nix ../../modules/nixos/caddy.nix ../../modules/nixos/matrix.nix + ../../modules/nixos/forgejo.nix ]; # Workaround for https://github.com/NixOS/nix/issues/8502 diff --git a/modules/nixos/caddy.nix b/modules/nixos/caddy.nix index 4c3b5d2..c21e9c8 100644 --- a/modules/nixos/caddy.nix +++ b/modules/nixos/caddy.nix @@ -49,6 +49,11 @@ } ''; + "git.jankremer.de".extraConfig = # caddyfile + '' + reverse_proxy localhost:3000 + ''; + "jankremer.eu".extraConfig = # caddyfile '' redir https://jankremer.de{uri} permanent diff --git a/modules/nixos/forgejo.nix b/modules/nixos/forgejo.nix index 654ce26..29d9825 100644 --- a/modules/nixos/forgejo.nix +++ b/modules/nixos/forgejo.nix @@ -1,5 +1,13 @@ { config, ... }: +let + domain = "git.jankremer.de"; +in { + age.secrets.forgejo-mailer = { + file = ../../modules/secrets/forgejo-mailer.age; + owner = "forgejo"; + }; + services = { forgejo = { enable = true; @@ -8,14 +16,23 @@ settings = { service.DISABLE_REGISTRATION = true; server = { - DOMAIN = "git.alpine-centauri.ts.net"; - ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}"; - HTTP_PORT = 3010; + DOMAIN = domain; + ROOT_URL = "https://${domain}"; + START_SSH_SERVER = false; + SSH_PORT = 22; }; - actions = { + mailer = { ENABLED = true; - DEFAULT_ACTIONS_URL = "github"; + SMTP_ADDR = "smtp.mail.me.com"; + SMTP_PORT = 587; + FROM = "git@jankremer.de"; + USER = "janurskremer@me.com"; + PASSWD_URI = "file:${config.age.secrets.forgejo-mailer.path}"; }; + # actions = { + # ENABLED = true; + # DEFAULT_ACTIONS_URL = "github"; + # }; }; }; }; diff --git a/modules/secrets/forgejo-mailer.age b/modules/secrets/forgejo-mailer.age new file mode 100644 index 0000000..d5eeb84 --- /dev/null +++ b/modules/secrets/forgejo-mailer.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 2otpcg 3/3V9NuhhEEvC5Czd52LroF3gb+5R8kVMwUQEdjQPz4 +W69B15eEI4+0v+TRKzS9mCs1+Gwjd2XeS9lykr5pxyQ +-> ssh-ed25519 40YjXQ Ie0rCVXk2DtsE/V8pcL3o7UXD1U/1Ag/knDrDOr0REw +Zuc42+JOtssFl7puQvHRdLuPpA51qgykiQ9/9xJlSK0 +-> ssh-ed25519 wbs2Dw qwhCUJQmXljIcEO8ysfSFpFPWqdmW5ysMhYxEW9QmUU +w5nSiL+pAX36RG2A/V4QijFjqVzIZ+5/HsbS/C2I8S0 +--- Rm8JLyJwpZp1BBfARjKFz7vnJjGagN1VOgpHSmI7zDU +‚C_.¹¡Ìâ"׋: `F…ƒ­U¤Ø_ÀŒ_)ÚžŸkRÉ7|I.b ±áö)4: \ No newline at end of file diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index 6a3e41e..9b47379 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -2,6 +2,7 @@ let malus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTpgedzJ7vs3GMOjUeQGkAzGhNZRhvMMz9Z1whaWieE"; galanthus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZYQao2OKQxyic+I327VZ7lQECh9hSS9cgsls3e/a1u"; nimbus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDIjr3r9RVTzMPNvfBWxVei8aGMlay3smMhhuGxEMRaj"; + all = [ malus galanthus @@ -13,4 +14,5 @@ in "paperless-admin.age".publicKeys = all; "tailscale.age".publicKeys = all; "matrix-registration-token.age".publicKeys = all; + "forgejo-mailer.age".publicKeys = all; }