aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2023-05-03 10:34:40 +0200
committerWojtek Kosior <koszko@koszko.org>2023-05-03 10:34:40 +0200
commitf237c9426fac911768839a086c33aa6fd2c6904a (patch)
treeed328e5128f5c041b52780dc3ed265d0ed0137e8
parent30a7f88238f22253d15c567489f92d539669a403 (diff)
downloadkoszko-org-server-f237c9426fac911768839a086c33aa6fd2c6904a.tar.gz
koszko-org-server-f237c9426fac911768839a086c33aa6fd2c6904a.zip
fix duplicated "httpd" group and user definition
-rw-r--r--container.scm17
1 files 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