Update remaining code to use new config scheme.

1 files changed, 13 insertions, 15 deletions

diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm
index e3ce168a..25b86735 100644
--- a/module/entry-points/server.scm
+++ b/module/entry-points/server.scm
@@ -2,7 +2,6 @@
   :export (main)
   :use-module (util)
   :use-module (vcomponent)
-  :use-module (util config all)
   )
 
 (use-modules* (web (server request response uri))
@@ -122,9 +121,8 @@
           [else AF_INET6]))
 
   (define-values (c e)
-    (load-calendars
-     calendar-files: (cond [(option-ref opts 'file #f) => list]
-                           [else (calendar-files)]) ))
+    (cond [(option-ref opts 'file #f) => (compose load-calendars list)]
+          [else (load-calendars)]))
 
 
 
@@ -134,19 +132,19 @@
   ;; placed after load-calendars to keep Guile 2.2 compability.
   (set! addr
     (if addr addr
-      (if (eqv? family AF_INET6)
-        "::" "0.0.0.0")))
+        (if (eqv? family AF_INET6)
+            "::" "0.0.0.0")))
 
   ;; NOTE The default make-default-socket is broken for IPv6.
   ;; A patch has been submitted to the mailing list. 2020-03-31
   (module-set!
-    (resolve-module '(web server http))
-    'make-default-socket
-    (lambda (family addr port)
-      (let ((sock (socket family SOCK_STREAM 0)))
-        (setsockopt sock SOL_SOCKET SO_REUSEADDR 1)
-        (bind sock family addr port)
-        sock)))
+   (resolve-module '(web server http))
+   'make-default-socket
+   (lambda (family addr port)
+     (let ((sock (socket family SOCK_STREAM 0)))
+       (setsockopt sock SOL_SOCKET SO_REUSEADDR 1)
+       (bind sock family addr port)
+       sock)))
 
 
   ;; TODO possibly test inet-pton here on address?
@@ -158,6 +156,6 @@
   (run-server (make-make-routes c e)
               'http
               `(family: ,family
-                port: ,port
-                host: ,addr)
+                        port: ,port
+                        host: ,addr)
               0))