fixed flags for dovecot.unix

Florian Schaal · Florian Schaal · commit c12031beb50f · 2015-07-09T17:24:22.000+02:00
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -368,7 +368,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -289,7 +289,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
 			af($conf[$config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ public function configure_dovecot()`
`368`	`368`	`}`
`369`	`369`	`//* Configure master.cf and add a line for deliver`
`370`	`370`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`371`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';`
	`371`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';`
`372`	`372`	`af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);`
`373`	`373`	`unset($content);`
`374`	`374`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public function configure_dovecot()`
`289`	`289`	`}`
`290`	`290`	`//* Configure master.cf and add a line for deliver`
`291`	`291`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`292`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';`
	`292`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';`
`293`	`293`	`af($conf[$config_dir.'/master.cf', $deliver_content);`
`294`	`294`	`unset($content);`
`295`	`295`	`unset($deliver_content);`