maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Improve user/group name handling on configuration script generation.

Browse Source
This commit is contained in:
avengerx
2012-07-01 01:17:20 -03:00
committed by avengerx
parent a2c49c3071
commit a6c5592541
9 changed files with 210 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/configfiles/gentoo.inc.php
View File

@@ -17,6 +17,23 @@
*
*/
// Try to guess user/group from settings' email UID/GID
$vmail_user=posix_getpwuid($settings['system']['vmail_uid']);
$vmail_group=posix_getgrgid($settings['system']['vmail_gid']);
/* If one of them are not set, call it 'vmail' and suggest creating user/group
* in scripts. */
if ($vmail_user === false) {
$vmail_username="mail"; // Gentoo uses 'mail' user/group
} else {
$vmail_username=$vmail_user['name'];
}
if ($vmail_group === false) {
$vmail_groupname="mail"; // Gentoo uses 'mail' user/group
} else {
$vmail_groupname=$vmail_group['name'];
}
return Array(
'gentoo' => Array(
'label' => 'Gentoo',
@@ -126,7 +143,7 @@ return Array(
'echo "mail-mta/postfix -dovecot-sasl sasl" >> /etc/portage/package.use',
'emerge -av postfix',
'mkdir -p ' . $settings['system']['vmail_homedir'],
'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
'chown -R '.$vmail_user['name'].':'.$vmail_group['name'].' ' . $settings['system']['vmail_homedir'],
'chmod 0750 ' . $settings['system']['vmail_homedir'],
'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo',
'touch /etc/postfix/main.cf',
@@ -169,7 +186,7 @@ return Array(
'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use',
'emerge -av postfix',
'mkdir -p ' . $settings['system']['vmail_homedir'],
'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
'chown -R '.$vmail_user['name'].':'.$vmail_group['name'].' ' . $settings['system']['vmail_homedir'],
'chmod 0750 ' . $settings['system']['vmail_homedir'],
'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo',
'touch /etc/postfix/main.cf',