Skip to content

GitLab

I
ISPConfig 3
Commit 5edf400d authored by Till Brehm's avatar Till Brehm
Browse files
Options

Fixed: FS#3314 - User/group modification fsails on OpenSUSE 12.x

parent 08b5daac
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 6 deletions
install/dist/lib/opensuse.lib.php
View file @ 5edf400d
......@@ -529,7 +529,9 @@ class installer_dist extends installer_base {
unset($content);
// Add the clamav user to the vscan group
exec('groupmod --add-user clamav vscan');
//exec('groupmod --add-user clamav vscan');
$command = 'usermod -a -G clamav vscan';
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
......@@ -1051,18 +1053,22 @@ class installer_dist extends installer_base {
// and must be fixed as this will allow the apache user to read the ispconfig files.
// Later this must run as own apache server or via suexec!
if($conf['apache']['installed'] == true){
$command = 'groupmod --add-user '.$conf['apache']['user'].' ispconfig';
//$command = 'groupmod --add-user '.$conf['apache']['user'].' ispconfig';
$command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
if(is_group('ispapps')){
$command = 'groupmod --add-user '.$conf['apache']['user'].' ispapps';
//$command = 'groupmod --add-user '.$conf['apache']['user'].' ispapps';
$command = 'usermod -a -G ispapps '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
}
if($conf['nginx']['installed'] == true){
$command = 'groupmod --add-user '.$conf['nginx']['user'].' ispconfig';
//$command = 'groupmod --add-user '.$conf['nginx']['user'].' ispconfig';
$command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
if(is_group('ispapps')){
$command = 'groupmod --add-user '.$conf['nginx']['user'].' ispapps';
//$command = 'groupmod --add-user '.$conf['nginx']['user'].' ispapps';
$command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
}
......
install/lib/installer_base.lib.php
View file @ 5edf400d
......@@ -1495,7 +1495,8 @@ class installer_base {
if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
//$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
$command = 'usermod -a -G '.$apps_vhost_group.' '.$conf['apache']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
if(!@is_dir($install_dir)){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment