From f237c9426fac911768839a086c33aa6fd2c6904a Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Wed, 3 May 2023 10:34:40 +0200
Subject: fix duplicated "httpd" group and user definition

---
 container.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/container.scm b/container.scm
index 4785cdc..480a747 100644
--- a/container.scm
+++ b/container.scm
@@ -23,7 +23,9 @@
              (guix build-system python)
              (guix packages)
              (guix search-paths)
-             (guix modules))
+             (guix modules)
+             ;; The following exports account-service-type.
+             (gnu system shadow))
 (use-package-modules web
                      python
                      version-control)
@@ -335,9 +337,18 @@
 (define %logformat-combined
   "\"%h %l %u %t \\\"%r\\\" %>s %O \\\"%{Referer}i\\\" \\\"%{User-Agent}i\\\"\"")
 
+(define koszko-httpd-service-type
+  (service-type
+   (inherit httpd-service-type)
+   (extensions (filter
+                (lambda (ext)
+                  (not (eq? (service-extension-target ext)
+                            account-service-type)))
+                (service-type-extensions httpd-service-type)))))
+
 (define %koszko-httpd-service
   (service
-   httpd-service-type
+   koszko-httpd-service-type
    (httpd-configuration
     (config
      (httpd-config-file
@@ -449,7 +460,7 @@
                (targets '("/dev/sdDOES-NOT-MATTER"))))
   (services
    (cons* %koszko-httpd-service
-          (simple-service 'koszko-org-website httpd-service-type
+          (simple-service 'koszko-org-website koszko-httpd-service-type
                           (append-map make-virtualhosts %all-site-confs))
           (service
            (shepherd-service-type
-- 
cgit v1.2.3