From 971994eb0831e37a7924ed0bc8893a56e3a2b3f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Sep 2023 20:35:15 +0200 Subject: gnu: postfix-minimal: Correct installation locations. * gnu/packages/mail.scm (postfix-minimal)[arguments]: Do not dump all files in the prefix directory. --- gnu/packages/mail.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8d392f17cb..6e86641fc1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -5030,19 +5030,30 @@ (define-public postfix-minimal "SHELL=" (assoc-ref inputs "bash") "/bin/sh")))))) (add-before 'install 'configure-install (lambda _ - (setenv "sendmail_path" (string-append #$output "/sendmail")) - (setenv "newaliases_path" (string-append #$output "/newaliases")) - (setenv "mailq_path" (string-append #$output "/mailq")) - (setenv "command_directory" #$output) - (setenv "config_directory" #$output) - (setenv "daemon_directory" #$output) - (setenv "data_directory" #$output) - (setenv "html_directory" #$output) - (setenv "queue_directory" #$output) - (setenv "manpage_directory" #$output) - (setenv "sample_directory" #$output) - (setenv "meta_directory" #$output) - (setenv "readme_directory" #$output) + (setenv "command_directory" + (string-append #$output "/sbin")) + (setenv "config_directory" + (string-append #$output "/etc/postfix")) + (setenv "daemon_directory" + (string-append #$output "/libexec/postfix")) + (setenv "data_directory" + (string-append #$output "/var/lib/postfix/data")) + (setenv "html_directory" + (string-append #$output "/share/postfix/doc/html")) + (setenv "mailq_path" + (string-append #$output "/bin/mailq")) + (setenv "manpage_directory" + (string-append #$output "/share/man")) + (setenv "meta_directory" + (string-append #$output "/etc/postfix")) + (setenv "newaliases_path" + (string-append #$output "/bin/newaliases")) + (setenv "queue_directory" + (string-append #$output "/var/lib/postfix/queue")) + (setenv "readme_directory" + (string-append #$output "/share/postfix/doc")) + (setenv "sendmail_path" + (string-append #$output "/bin/sendmail")) (setenv "tempdir" "/tmp"))) ;; done in the service activation snippet ;; we don't have the account here -- cgit v1.2.3