packages.scm: Remove "(extra-mappings ...)" from configuration records

1 files changed, 9 insertions, 21 deletions

diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm
index e4cbb5f..bbcd27b 100644
--- a/src/org/euandre/packages.scm
+++ b/src/org/euandre/packages.scm
@@ -44,7 +44,6 @@
              binder-configuration-run-directory
              binder-configuration-run-in-container?
              binder-configuration-container-name
-             binder-configuration-extra-mappings
              binder-configuration-options
              binder-configuration-listen-socket
              binder-configuration-upstream-socket
@@ -62,7 +61,6 @@
              glaze-configuration-run-directory
              glaze-configuration-run-in-container?
              glaze-configuration-container-name
-             glaze-configuration-extra-mappings
              glaze-configuration-options
              glaze-configuration-listen-socket
              glaze-configuration-upstream-socket
@@ -80,7 +78,6 @@
              hsts-configuration-run-directory
              hsts-configuration-run-in-container?
              hsts-configuration-container-name
-             hsts-configuration-extra-mappings
              hsts-configuration-options
              hsts-configuration-listen-socket
              hsts-configuration-upstream-socket
@@ -98,7 +95,6 @@
              untls-configuration-run-directory
              untls-configuration-run-in-container?
              untls-configuration-container-name
-             untls-configuration-extra-mappings
              untls-configuration-options
              untls-configuration-listen-socket
              untls-configuration-upstream-socket
@@ -116,7 +112,6 @@
              wscat-configuration-run-directory
              wscat-configuration-run-in-container?
              wscat-configuration-container-name
-             wscat-configuration-extra-mappings
              wscat-configuration-options
              wscat-configuration-listen-socket
              wscat-configuration-upstream-socket
@@ -775,7 +770,6 @@ root                   ALL=(ALL)                      ALL
   (run-directory     binder-configuration-run-directory     (default "/var/run/binder"))
   (run-in-container? binder-configuration-run-in-container? (default #t))
   (container-name    binder-configuration-container-name    (default "binder-container"))
-  (extra-mappings    binder-configuration-extra-mappings    (default '()))
   (options           binder-configuration-options           (default '()))
   (listen-socket     binder-configuration-listen-socket     (default "0.0.0.0:4443"))
   (upstream-socket   binder-configuration-upstream-socket   (default "/var/run/untls/untls.socket")))
@@ -793,7 +787,6 @@ root                   ALL=(ALL)                      ALL
   (run-directory     glaze-configuration-run-directory     (default "/var/run/glaze"))
   (run-in-container? glaze-configuration-run-in-container? (default #t))
   (container-name    glaze-configuration-container-name    (default "glaze-container"))
-  (extra-mappings    glaze-configuration-extra-mappings    (default '()))
   (options           glaze-configuration-options           (default '()))
   (listen-socket     glaze-configuration-listen-socket     (default "/var/run/glaze/glaze.socket"))
   (upstream-socket   glaze-configuration-upstream-socket   (default #f)))
@@ -811,7 +804,6 @@ root                   ALL=(ALL)                      ALL
   (run-directory     hsts-configuration-run-directory     (default "/var/run/hsts"))
   (run-in-container? hsts-configuration-run-in-container? (default #t))
   (container-name    hsts-configuration-container-name    (default "hsts-container"))
-  (extra-mappings    hsts-configuration-extra-mappings    (default '()))
   (options           hsts-configuration-options           (default '()))
   (listen-socket     hsts-configuration-listen-socket     (default "/var/run/hsts/hsts.socket"))
   (upstream-socket   hsts-configuration-upstream-socket   (default #f)))
@@ -829,7 +821,6 @@ root                   ALL=(ALL)                      ALL
   (run-directory     untls-configuration-run-directory     (default "/var/run/untls"))
   (run-in-container? untls-configuration-run-in-container? (default #t))
   (container-name    untls-configuration-container-name    (default "untls-container"))
-  (extra-mappings    untls-configuration-extra-mappings    (default '()))
   (options           untls-configuration-options           (default '()))
   (listen-socket     untls-configuration-listen-socket     (default "/var/run/untls/untls.socket"))
   (upstream-socket   untls-configuration-upstream-socket   (default #f)))
@@ -847,7 +838,6 @@ root                   ALL=(ALL)                      ALL
   (run-directory     wscat-configuration-run-directory     (default "/var/run/wscat"))
   (run-in-container? wscat-configuration-run-in-container? (default #t))
   (container-name    wscat-configuration-container-name    (default "wscat-container"))
-  (extra-mappings    wscat-configuration-extra-mappings    (default '()))
   (options           wscat-configuration-options           (default '()))
   (listen-socket     wscat-configuration-listen-socket     (default "/var/run/wscat/wscat.socket"))
   (upstream-socket   wscat-configuration-upstream-socket   (default "/var/run/papod/papod.socket")))
@@ -897,7 +887,7 @@ root                   ALL=(ALL)                      ALL
 (define-public (cmd-for config-type config)
   (m:match config
     (($ config-type name package user group _log-file data-directory
-        _run-directory run-in-container? container-name extra-mappings)
+        _run-directory run-in-container? container-name)
      (let ((bin (file-append package (str "/bin/" name))))
        (if (not run-in-container?)
          bin
@@ -910,21 +900,19 @@ root                   ALL=(ALL)                      ALL
           #:preserved-environment-variables
           '()
           #:mappings
-          (append
-           (mklist
-            (and data-directory
-                 (file-system-mapping
-                   (source data-directory)
-                   (target source)
-                   (writable? #t))))
-           extra-mappings)))))))
+          (mklist
+           (and data-directory
+                (file-system-mapping
+                  (source data-directory)
+                  (target source)
+                  (writable? #t))))))))))
 
 (define-public (shepherd-services-for config-type)
   (lambda (config)
     (m:match config
       (($ config-type name _package user group log-file data-directory
-          _run-directory _run-in-container? _container-name _extra-mappings
-          options listen-socket upstream-socket)
+          _run-directory _run-in-container? _container-name options
+          listen-socket upstream-socket)
        (list
         (shepherd-service
           (provision (list (string->symbol name)))