From 3c2c7b7086e4a94b7c2b20b843bd4d27f7bf6c48 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Sun, 2 Nov 2025 02:09:46 +0000
Subject: forge: Serve tissue on separate domain.

Serve tissue on a separate domain so that the forge can serve its own
web interface on the main domain.
---
 guix/forge/forge.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'guix')

diff --git a/guix/forge/forge.scm b/guix/forge/forge.scm
index 34476f5..cec5cf7 100644
--- a/guix/forge/forge.scm
+++ b/guix/forge/forge.scm
@@ -49,6 +49,7 @@
             forge-configuration
             forge-configuration?
             forge-configuration-web-domain
+            forge-configuration-tissue-web-domain
             forge-configuration-projects
             forge-project
             forge-project?
@@ -108,6 +109,8 @@
   forge-configuration?
   (web-domain forge-configuration-web-domain
               (default #f))
+  (tissue-web-domain forge-configuration-tissue-web-domain
+                     (default #f))
   (projects forge-configuration-projects
             (default '())))
 
@@ -453,13 +456,12 @@ that were built."
 (define (forge-nginx-server-blocks config)
   "Return list of @code{<nginx-server-configuration>} extensions for
 forge configuration @var{config}."
-  ;; Configure nginx server blocks for projects that have a web domain
-  ;; and a website directory, but do not have tissue enabled.
+  ;; Configure nginx server blocks for projects that have a web domain and a
+  ;; website directory.
   (filter-map (match-record-lambda <forge-project>
-                  (web-domain website-directory tissue?)
+                  (web-domain website-directory)
                 (and web-domain
                      website-directory
-                     (not tissue?)
                      (nginx-server-configuration
                       (server-name (list web-domain))
                       (root website-directory))))
@@ -469,10 +471,11 @@ forge configuration @var{config}."
   "Return list of @code{<tissue-host>} objects for forge configuration
 @var{config}."
   (match-record config <forge-configuration>
-      (web-domain projects)
-      (if web-domain
+      (tissue-web-domain projects)
+      ;; Configure tissue host if a tissue web domain is provided.
+      (if tissue-web-domain
           (list (tissue-host
-                 (name web-domain)
+                 (name tissue-web-domain)
                  (projects
                   (filter-map (lambda (project)
                                 (and (forge-project-tissue? project)
-- 
cgit 1.4.1