diff options
| -rw-r--r-- | doc/forge.skb | 6 | ||||
| -rw-r--r-- | guix/forge/forge.scm | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/doc/forge.skb b/doc/forge.skb index 2538401..27a430e 100644 --- a/doc/forge.skb +++ b/doc/forge.skb @@ -557,8 +557,10 @@ gunicorn is run in])))))) [Its value])) (record-documentation "guix/forge/forge.scm" '<forge-configuration> (record-field "web-domain" - [Optional domain name on which to serve project listing and -tissue-powered websites]) + [Optional domain name on which to serve the guix-forge web +interface]) + (record-field "tissue-web-domain" + [Optional domain name on which to server tissue]) (record-field "projects" [List of ,(record-ref "<forge-project>") objects describing projects managed by guix-forge])) 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) |