Move mailman2-bin parameter to configuration.

This commit is contained in:
Dominik Pantůček 2023-09-15 10:49:29 +02:00
parent 1f9f2503ab
commit 08483773f0
3 changed files with 15 additions and 8 deletions

View file

@ -260,7 +260,8 @@ environment.import.scm: $(ENVIRONMENT-SOURCES)
MAILMAN2-SOURCES=mailman2.scm progress.import.scm \ MAILMAN2-SOURCES=mailman2.scm progress.import.scm \
util-bst-lset.import.scm util-io.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.o: mailman2.import.scm
mailman2.import.scm: $(MAILMAN2-SOURCES) mailman2.import.scm: $(MAILMAN2-SOURCES)

View file

@ -37,6 +37,7 @@
*email-from* *email-from*
*summary-mailto* *summary-mailto*
*doku-base* *doku-base*
*mailman2-bin*
load-configuration! load-configuration!
) )
@ -88,6 +89,10 @@
(define *doku-base* (make-parameter #f)) (define *doku-base* (make-parameter #f))
(define =doku-base= "/var/www") (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) (define (load-single-configuration! fname)
(when (file-exists? fname) (when (file-exists? fname)
(let loop ((lines (read-lines (open-input-file fname)))) (let loop ((lines (read-lines (open-input-file fname))))
@ -120,6 +125,9 @@
((dokuwiki) ((dokuwiki)
(when (not (*doku-base*)) (when (not (*doku-base*))
(*doku-base* v))) (*doku-base* v)))
((mailman2)
(when (not (*mailman2-bin*))
(*mailman2-bin* v)))
))) )))
(loop (cdr lines))))))) (loop (cdr lines)))))))
@ -145,6 +153,8 @@
(when (not (*summary-mailto*)) (when (not (*summary-mailto*))
(*summary-mailto* =summary-mailto=)) (*summary-mailto* =summary-mailto=))
(when (not (*doku-base*)) (when (not (*doku-base*))
(*doku-base* =doku-base=))) (*doku-base* =doku-base=))
(when (not (*mailman2-bin*))
(*mailman2-bin* =mailman2-bin=)))
) )

View file

@ -28,8 +28,6 @@
(module (module
mailman2 mailman2
( (
*mailman2-bin*
list-mailman2-lists list-mailman2-lists
list-mailman2-list-members list-mailman2-list-members
load-mailman2-list load-mailman2-list
@ -49,10 +47,8 @@
progress progress
util-bst-lset util-bst-lset
util-io util-io
mailman-common) mailman-common
configuration)
;; Where does the mailman binaries reside
(define *mailman2-bin* (make-parameter "/usr/lib/mailman/bin"))
;; Returns full path to given mailman binary ;; Returns full path to given mailman binary
(define (mailman-bin bin) (define (mailman-bin bin)