From 0b347fe0580b13187660ee2a534ad7c47e3cf386 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Mon, 25 May 2026 05:10:20 +0200
Subject: redefine fcgiwrap configuration in a more proper module

---
 deployment/services/web.scm  | 17 ++++++++++++++++-
 deployment/system.scm        |  2 +-
 deployment/system/aisaka.scm | 12 ------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/deployment/services/web.scm b/deployment/services/web.scm
index ef59751..fdbf007 100644
--- a/deployment/services/web.scm
+++ b/deployment/services/web.scm
@@ -19,7 +19,8 @@
 ;;; If not, see <https://www.gnu.org/licenses/>.
 
 (define-module (deployment services web)
-  #:export     (nginx-service-aisaka
+  #:export     (fcgiwrap-service-aisaka
+                nginx-service-aisaka
                 nginx-location-well-known
                 nginx-service-type*)
   #:use-module (gnu services)
@@ -27,11 +28,25 @@
   #:use-module (guix gexp)
   #:use-module ((gnu packages matrix)
                 #:prefix gnu:packages:matrix:)
+  #:use-module ((gnu packages web)
+                #:prefix gnu:packages:web:)
   #:use-module ((gnu system shadow)
                 #:prefix gnu:system:shadow:)
   #:use-module ((sovereign system accounts)
                 #:prefix sovereign:system:accounts:))
 
+(define fcgiwrap-configuration-aisaka
+  (fcgiwrap-configuration
+   (package gnu:packages:web:fcgiwrap)
+   (socket  "tcp:127.0.0.1:9000")
+   (user    "git")
+   (group   "git")))
+
+(define fcgiwrap-service-aisaka
+  (service
+   fcgiwrap-service-type
+   fcgiwrap-configuration-aisaka))
+
 (define nginx-accounts
   (let
       ((accounts- (list sovereign:system:accounts:nginx-group
diff --git a/deployment/system.scm b/deployment/system.scm
index 62783da..4227253 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -126,7 +126,7 @@
                                    deployment:services:mail:dkimproxy-out-service
                                    users:id1000:dovecot-service
                                    deployment:services:mail:etc-mailname-aisaka
-                                   deployment:system:aisaka:fcgiwrap
+                                   deployment:services:web:fcgiwrap-service-aisaka
                                    deployment:system:aisaka:gitolite
                                    deployment:system:aisaka:guix-home-service
                                    deployment:system:aisaka:guix-publish-service
diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm
index ac4eda5..4ecd374 100644
--- a/deployment/system/aisaka.scm
+++ b/deployment/system/aisaka.scm
@@ -45,8 +45,6 @@
                 #:prefix gnu:services:shepherd:)
   #:use-module ((gnu services version-control)
                 #:prefix gnu:services:version-control:)
-  #:use-module ((gnu services web)
-                #:prefix gnu:services:web:)
   #:use-module ((gnu system)
                 #:prefix gnu:system:)
   #:use-module ((gnu system accounts)
@@ -84,16 +82,6 @@
   #:use-module ((users vmail)
                 #:prefix users:vmail:))
 
-(define fcgiwrap-configuration
-  (gnu:services:web:fcgiwrap-configuration
-   (user  "git")
-   (group "git")))
-
-(define-public fcgiwrap
-  (gnu:services:service
-   gnu:services:web:fcgiwrap-service-type
-   fcgiwrap-configuration))
-
 (define-public file-system-efi
   (gnu:system:file-systems:file-system
    (device                (gnu:system:file-systems:file-system-label "BOOT"))
-- 
cgit v1.3