ftimme
2011-09-29 272aecd1e82a90340afc03ac6feff42bde774be5
- Added a check to see if the group "ispapps" exists.
4 files modified
18 ■■■■■ changed files
install/dist/lib/fedora.lib.php 6 ●●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php 4 ●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 4 ●●●● patch | view | raw | blame | history
install/lib/installer_base.lib.php 4 ●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php
@@ -857,18 +857,24 @@
        if($conf['apache']['installed'] == true){
            $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 = '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 = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
            if(is_user('ispapps')){
            // Allow the ispapps vhost access to /etc/squirrelmail
            $command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
            }
            if(is_group('ispapps')){
            $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        }
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";
install/dist/lib/gentoo.lib.php
@@ -870,15 +870,19 @@
        if($conf['apache']['installed'] == true){
            $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 = '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 = '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 = 'usermod -a -G ispapps '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        }
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";
install/dist/lib/opensuse.lib.php
@@ -894,15 +894,19 @@
        if($conf['apache']['installed'] == true){
            $command = 'groupmod --add-user '.$conf['apache']['user'].' ispconfig';
            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';
            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';
            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';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        }
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";
install/lib/installer_base.lib.php
@@ -1752,15 +1752,19 @@
        if($conf['apache']['installed'] == true){
            $command = 'adduser '.$conf['apache']['user'].' ispconfig';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
            if(is_group('ispapps')){
            $command = 'adduser '.$conf['apache']['user'].' ispapps';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
            }
        }
        if($conf['nginx']['installed'] == true){
            $command = 'adduser '.$conf['nginx']['user'].' ispconfig';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
            if(is_group('ispapps')){
            $command = 'adduser '.$conf['nginx']['user'].' ispapps';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        }
        }
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";