From d4461434136278f562adec5055ea8d606a1f6d68 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 25 Dec 2022 01:58:21 +0300 Subject: feat(ops/modules): set up public-inbox at inbox.tvl.su Initial setup which does not yet include fetching mails at all, this is for now only going to display a manually populated view of the existing mailing list while the rest of this stuff is set up. Change-Id: Ie1235bd257c9056fe37d0740dfca771ebdd880eb Reviewed-on: https://cl.tvl.fyi/c/depot/+/7628 Reviewed-by: flokli Reviewed-by: sterni Tested-by: BuildkiteCI --- ops/machines/sanduny/default.nix | 5 ++++ ops/modules/depot-inbox.nix | 50 ++++++++++++++++++++++++++++++++++++++++ ops/modules/www/inbox.tvl.su.nix | 24 +++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 ops/modules/depot-inbox.nix create mode 100644 ops/modules/www/inbox.tvl.su.nix diff --git a/ops/machines/sanduny/default.nix b/ops/machines/sanduny/default.nix index 886a3a1be72d..4db6311ceb6b 100644 --- a/ops/machines/sanduny/default.nix +++ b/ops/machines/sanduny/default.nix @@ -15,11 +15,13 @@ in { imports = [ (mod "cgit.nix") + (mod "depot-inbox.nix") (mod "depot-replica.nix") (mod "journaldriver.nix") (mod "known-hosts.nix") (mod "tvl-cache.nix") (mod "tvl-users.nix") + (mod "www/inbox.tvl.su.nix") (mod "www/self-redirect.nix") ]; @@ -87,6 +89,9 @@ in repo = "/var/lib/depot"; }; + # Serve public-inbox ... + services.depot.inbox.enable = true; + time.timeZone = "UTC"; # GRUB does not actually need to be installed on disk; Bitfolk have diff --git a/ops/modules/depot-inbox.nix b/ops/modules/depot-inbox.nix new file mode 100644 index 000000000000..b791cc6db730 --- /dev/null +++ b/ops/modules/depot-inbox.nix @@ -0,0 +1,50 @@ +# public-inbox configuration for depot@tvl.su +# +# The account itself is a Yandex 360 account in the tvl.su organisation, which +# is accessed via IMAP. Yandex takes care of spam filtering for us, so there is +# no particular SpamAssassin or other configuration. +{ config, lib, pkgs, ... }: + +let + cfg = config.services.depot.inbox; +in +{ + options.services.depot.inbox = with lib; { + enable = mkEnableOption "Enable public-inbox for depot@tvl.su"; + + depotPath = mkOption { + description = "path to local depot replica"; + type = types.str; + default = "/var/lib/depot"; + }; + }; + + config = lib.mkIf cfg.enable { + services.public-inbox = { + enable = true; + + http.enable = true; + http.port = 8053; + # imap.enable = true; + # nntp.enable = true; + + inboxes.depot = rec { + address = [ + "depot@tvl.su" # primary address + "depot@tazj.in" # legacy address + ]; + + description = "TVL depot development"; + coderepo = [ "depot" ]; + url = "https://inbox.tvl.su/depot"; + }; + + settings.coderepo.depot = { + dir = cfg.depotPath; + cgitUrl = "https://code.tvl.fyi"; + }; + + settings.publicinbox.wwwlisting = "all"; + }; + }; +} diff --git a/ops/modules/www/inbox.tvl.su.nix b/ops/modules/www/inbox.tvl.su.nix new file mode 100644 index 000000000000..a9af18e3481b --- /dev/null +++ b/ops/modules/www/inbox.tvl.su.nix @@ -0,0 +1,24 @@ +{ config, ... }: + +{ + imports = [ + ./base.nix + ]; + + config = { + services.nginx.virtualHosts."inbox.tvl.su" = { + enableACME = true; + forceSSL = true; + + extraConfig = '' + location = / { + return 302 https://inbox.tvl.su/depot; + } + + location / { + proxy_pass http://localhost:${toString config.services.public-inbox.http.port}; + } + ''; + }; + }; +} -- cgit 1.4.1