refactor(izumi): localize imports of module (gnu services web)

1 files changed, 15 insertions, 14 deletions

diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index f31df57..1b8602f 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -3,8 +3,7 @@
 (define radicale-keys "/secrets/radicale/keys")
 (define dovecot-keys "/secrets/dovecot")
 
-(use-modules (gnu services web)
-             (gnu services xorg)
+(use-modules (gnu services xorg)
              (gnu system)
              (gnu system accounts)
              (gnu system file-systems)
@@ -32,7 +31,8 @@
                                           "/sbin/nologin")))))
 
 (define (nginx-service-type*)
-  (use-modules (gnu services))
+  (use-modules (gnu services)
+               (gnu services web))
   ((@ (gnu services) service-type)
    (inherit nginx-service-type)
    (extensions (map (lambda (extension)
@@ -106,14 +106,14 @@
    ((@ (gnu services cgit) cgit-configuration)
     (nginx
      (list
-      (nginx-server-configuration
+      ((@ (gnu services web) nginx-server-configuration)
        (locations
         (list
          (git-http-nginx-location-configuration
           ((@ (gnu services version-control) git-http-configuration)
            (git-root "/var/lib/gitolite/repositories")
            (uri-path "/git")))
-         (nginx-location-configuration
+         ((@ (gnu services web) nginx-location-configuration)
           (body
            (list
             "fastcgi_param HTTP_HOST $server_name ;"
@@ -122,7 +122,7 @@
             "fastcgi_param SCRIPT_FILENAME $document_root/lib/cgit/cgit.cgi ;"
             "fastcgi_pass 127.0.0.1:9000 ;"))
           (uri "@cgit"))
-         (nginx-location-configuration
+         ((@ (gnu services web) nginx-location-configuration)
           (body (list "root /srv/www/marek/marekpasnikowski.pl/ ;"))
           (uri "/.well-known"))))
        (listen (list "192.168.10.2:443 ssl"))
@@ -190,8 +190,9 @@
 (define (fcgiwrap)
   ((@ (gnu services) service)
    fcgiwrap-service-type
-   (fcgiwrap-configuration (user "git")
-                           (group "git"))))
+   ((@ (gnu services web) fcgiwrap-configuration)
+    (user "git")
+    (group "git"))))
 
 (define (gitolite)
   ((@ (gnu services) service)
@@ -383,14 +384,14 @@
 (define (nginx-izumi)
   ((@ (gnu services) service)
    nginx-service-type*
-   (nginx-configuration
+   ((@ (gnu services web) nginx-configuration)
     (server-blocks
      (list
       ;; Top-Level
-      (nginx-server-configuration
+      ((@ (gnu services web) nginx-server-configuration)
        (locations
         (list
-         (nginx-location-configuration
+         ((@ (gnu services web) nginx-location-configuration)
           (uri "/.well-known" )
           (body
            (list "root /srv/www/marek/marekpasnikowski.pl ;")))))
@@ -402,10 +403,10 @@
        (ssl-certificate-key
         "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem"))
       ;; Radicale
-      (nginx-server-configuration
+      ((@ (gnu services web) nginx-server-configuration)
        (locations
         (list
-         (nginx-location-configuration
+         ((@ (gnu services web) nginx-location-configuration)
           (body
            (list
             "proxy_pass http://localhost:5232/ ;"
@@ -414,7 +415,7 @@
             "proxy_set_header Host $http_host ;"
             "proxy_pass_header Authorization ;"))
           (uri "/"))
-         (nginx-location-configuration
+         ((@ (gnu services web) nginx-location-configuration)
           (body
            (list "root /srv/www/marek/marekpasnikowski.pl ;"))
           (uri "/.well-known"))))