From 08483773f083746a1c4ae92abded2bdaca2636c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?=
 <dominik.pantucek@trustica.cz>
Date: Fri, 15 Sep 2023 10:49:29 +0200
Subject: [PATCH] Move mailman2-bin parameter to configuration.

---
 src/Makefile          |  3 ++-
 src/configuration.scm | 12 +++++++++++-
 src/mailman2.scm      |  8 ++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 5cdcf32..014e25c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -260,7 +260,8 @@ environment.import.scm: $(ENVIRONMENT-SOURCES)
 
 MAILMAN2-SOURCES=mailman2.scm progress.import.scm	\
 	util-bst-lset.import.scm util-io.import.scm	\
-	util-list.import.scm mailman-common.import.scm
+	util-list.import.scm mailman-common.import.scm	\
+	configuration.import.scm
 
 mailman2.o: mailman2.import.scm
 mailman2.import.scm: $(MAILMAN2-SOURCES)
diff --git a/src/configuration.scm b/src/configuration.scm
index a4dd70e..9b9b796 100644
--- a/src/configuration.scm
+++ b/src/configuration.scm
@@ -37,6 +37,7 @@
   *email-from*
   *summary-mailto*
   *doku-base*
+  *mailman2-bin*
   
   load-configuration!
   )
@@ -88,6 +89,10 @@
  (define *doku-base* (make-parameter #f))
  (define =doku-base= "/var/www")
 
+ ;; Where does the mailman binaries reside
+ (define *mailman2-bin* (make-parameter #f))
+ (define =mailman2-bin= "/usr/lib/mailman/bin")
+
  (define (load-single-configuration! fname)
    (when (file-exists? fname)
      (let loop ((lines (read-lines (open-input-file fname))))
@@ -120,6 +125,9 @@
 		 ((dokuwiki)
 		  (when (not (*doku-base*))
 		    (*doku-base* v)))
+		 ((mailman2)
+		  (when (not (*mailman2-bin*))
+		    (*mailman2-bin* v)))
 		 )))
 	   (loop (cdr lines)))))))
 
@@ -145,6 +153,8 @@
    (when (not (*summary-mailto*))
      (*summary-mailto* =summary-mailto=))
    (when (not (*doku-base*))
-     (*doku-base* =doku-base=)))
+     (*doku-base* =doku-base=))
+   (when (not (*mailman2-bin*))
+     (*mailman2-bin* =mailman2-bin=)))
 
  )
diff --git a/src/mailman2.scm b/src/mailman2.scm
index 9b10cb0..81308ce 100644
--- a/src/mailman2.scm
+++ b/src/mailman2.scm
@@ -28,8 +28,6 @@
 (module
  mailman2
  (
-  *mailman2-bin*
-
   list-mailman2-lists
   list-mailman2-list-members
   load-mailman2-list
@@ -49,10 +47,8 @@
 	 progress
 	 util-bst-lset
 	 util-io
-	 mailman-common)
-
- ;; Where does the mailman binaries reside
- (define *mailman2-bin* (make-parameter "/usr/lib/mailman/bin"))
+	 mailman-common
+	 configuration)
 
  ;; Returns full path to given mailman binary
  (define (mailman-bin bin)