website: extract 'donate' module

configuration.nix

@@ -66,7 +66,10 @@ services = {
   };
   services.joinmarket-ob-watcher.enable = true;
 
-  nix-bitcoin-org.website.enable = true;
+  nix-bitcoin-org.website = {
+    enable = true;
+    donate.btcpayserverAppId = "4D1Dxb5cGnXHRgNRBpoaraZKTX3i";
+  };
 
   services.backups.enable = true;
 };

test/btcpayserver-config/default.nix

@@ -10,6 +10,10 @@ let
   psql = "${config.services.postgresql.package}/bin/psql";
 in
 {
+  nix-bitcoin-org.website.donate = {
+    btcpayserverAppId = lib.mkForce "qJ1NExmDYQLr6MoyZFypeeFgLNj";
+  };
+
   systemd.services.importBtcpayserverConfig = rec {
     requires = [ "postgresql.service" ];
     after = requires;

test/scenarios.nix

@@ -11,6 +11,7 @@ rec {
       ../configuration.nix
       scenarios.regtestBase
       disableFeatures
+      ./btcpayserver-config
     ];
 
     # Improve eval performance by reusing pkgs
@@ -112,6 +113,8 @@ rec {
     nix-bitcoin-org.website.enable = mkForce true;
     services.clightning.enable = mkForce true;
     services.btcpayserver.enable = mkForce true;
+    # Required for btcpayserver currency rate fetching
+    test.container.enableWAN = true;
   };
 
   # To demonstrate failures in the test runner

website/default.nix

@@ -5,6 +5,10 @@ let
   options = {
     nix-bitcoin-org.website = {
       enable = mkEnableOption "nix-bitcoin.org website";
+      nginxHostConfig = mkOption {
+        type = types.lines;
+        default = "";
+      };
     };
   };
 
@@ -16,10 +20,10 @@ let
     "localhost";
 
   serviceAddress = service:
-    with config.services.${service};
-    "${address}:${toString port}";
-
+    with config.services.${service}; "${address}:${toString port}";
 in {
+  imports = [ ./donate ];
+
   inherit options;
 
   config = mkIf cfg.enable (mkMerge [
@@ -41,32 +45,21 @@ in {
 
     services.btcpayserver.rootpath = "btcpayserver";
 
+    nix-bitcoin-org.website.nginxHostConfig = mkBefore ''
+      root /var/www;
+
+      add_header Onion-Location http://qvzlxbjvyrhvsuyzz5t63xx7x336dowdvt7wfj53sisuun4i4rdtbzid.onion$request_uri;
+
+      location /obwatcher/ {
+        proxy_pass http://${serviceAddress "joinmarket-ob-watcher"};
+        rewrite /obwatcher/(.*) /$1 break;
+      }
+    '';
+
     services.nginx = let
-      hostConfig = {
-        extraConfig = ''
-          root /var/www;
-
-          location /btcpayserver/ {
-            proxy_pass http://${serviceAddress "btcpayserver"};
-          }
-
-          # Disallow access to the btcpayserver admin interface and the API
-          location ~* ^/btcpayserver/(login|register|account|api|)(?:$|/) {
-            return 404;
-          }
-
-          location = /donate {
-            rewrite /donate /btcpayserver/apps/4D1Dxb5cGnXHRgNRBpoaraZKTX3i/pos;
-          }
-
-          location /obwatcher/ {
-            proxy_pass http://${serviceAddress "joinmarket-ob-watcher"};
-            rewrite /obwatcher/(.*) /$1 break;
-          }
-
-          add_header Onion-Location http://qvzlxbjvyrhvsuyzz5t63xx7x336dowdvt7wfj53sisuun4i4rdtbzid.onion$request_uri;
-        '';
-      };
+      hostConfig.extraConfig = ''
+        include ${pkgs.writeText "common.conf" cfg.nginxHostConfig};
+      '';
     in {
       enable = true;
       enableReload = true;

website/donate/default.nix

@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  options = {
+    nix-bitcoin-org.website.donate = {
+      btcpayserverAppId = mkOption {
+        type = types.str;
+      };
+    };
+  };
+
+  cfg = config.nix-bitcoin-org.website.donate;
+
+  btcpayserverAddress = with config.services.btcpayserver; "${address}:${toString port}";
+in {
+  inherit options;
+
+  config = {
+    nix-bitcoin-org.website.nginxHostConfig = ''
+      location = /donate {
+        rewrite /donate /btcpayserver/apps/${cfg.btcpayserverAppId}/pos;
+      }
+
+      location /btcpayserver/ {
+        proxy_pass http://${btcpayserverAddress};
+
+        # Disallow access to the btcpayserver admin interface and the API
+        location ~* ^/btcpayserver/(login|register|account|api|)(?:$|/) {
+          return 404;
+        }
+      }
+    '';
+  };
+}