diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-01-12 17:56:54 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-12 17:56:54 +0300 |
commit | 9c502abb1cd764b6c0dd3099705273b8e8ef36bf (patch) | |
tree | 05924846cba2a9eadc7d05f83674139ff4d4a980 /nixos/modules | |
parent | 902dd35d47d5ab62345f2e17537818cc69cc5cb9 (diff) | |
download | nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar.gz nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar.bz2 nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar.lz nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar.xz nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.tar.zst nixlib-9c502abb1cd764b6c0dd3099705273b8e8ef36bf.zip |
nixos/postfix: use path instead of direct package mentions
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/mail/postfix.nix | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 9c3c77450215..4d5f9c8c5480 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -405,6 +405,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + path = [ pkgs.postfix ]; serviceConfig = { Type = "forking"; @@ -416,35 +417,35 @@ in }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop} - - ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/lib/postfix - ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue - ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue/pid - ${pkgs.coreutils}/bin/chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop} - ${pkgs.coreutils}/bin/chmod 770 /var/lib/postfix/queue/{public,maildrop} - - ${pkgs.coreutils}/bin/rm -rf /var/lib/postfix/conf - ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/conf - ${pkgs.coreutils}/bin/ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf - ${pkgs.coreutils}/bin/ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf + mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop} + + chown -R ${user}:${group} /var/lib/postfix + chown root /var/lib/postfix/queue + chown root /var/lib/postfix/queue/pid + chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop} + chmod 770 /var/lib/postfix/queue/{public,maildrop} + + rm -rf /var/lib/postfix/conf + mkdir -p /var/lib/postfix/conf + ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf + ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf ${optionalString haveAliases '' - ${pkgs.coreutils}/bin/ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases - ${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/aliases + ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases + postalias /var/lib/postfix/conf/aliases ''} ${optionalString haveTransport '' ${pkgs.coreutils}/bin/ln -sf ${transportFile} /var/lib/postfix/conf/transport ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/transport ''} ${optionalString haveVirtual '' - ${pkgs.coreutils}/bin/ln -sf ${virtualFile} /var/lib/postfix/conf/virtual - ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/virtual + ln -sf ${virtualFile} /var/lib/postfix/conf/virtual + postmap /var/lib/postfix/conf/virtual ''} - ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail - ${pkgs.coreutils}/bin/chown root:root /var/spool/mail - ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail - ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/ + mkdir -p /var/spool/mail + chown root:root /var/spool/mail + chmod a+rwxt /var/spool/mail + ln -sf /var/spool/mail /var/ ''; }; |