- Make sure the installer adds the nginx user to the ispconfig group (if ng...

ftimme

2011-09-25 63b3694383462096a47747132e24d1c5c6ac0cdb

- Make sure the installer adds the nginx user to the ispconfig group (if nginx is installed).

 install/dist/lib/fedora.lib.php

@@ -581,7 +581,7 @@
        exec('mkdir -p '.$conf['nginx']['vhost_conf_enabled_dir']);
        exec('mkdir -p '.$conf['nginx']['vhost_conf_dir']);

        wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*.conf;");
        wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*;");

        //* make sure that webalizer finds its config file when it is directly in /etc
        if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
@@ -854,8 +854,14 @@
        // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
        // 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!
        $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        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($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");
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";

 install/dist/lib/gentoo.lib.php

@@ -854,8 +854,14 @@
        // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
        // 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!
        $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        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($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");
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";

 install/dist/lib/opensuse.lib.php

@@ -831,8 +831,14 @@
        // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
        // 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!
        $command = 'groupmod --add-user wwwrun ispconfig';
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        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($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");
        }
        
        //* Make the shell scripts executable
        $command = "chmod +x $install_dir/server/scripts/*.sh";

 install/lib/installer_base.lib.php

@@ -1732,8 +1732,14 @@
        // TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
        // 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!
        $command = 'adduser www-data ispconfig';
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        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($conf['nginx']['installed'] == true){
            $command = 'adduser '.$conf['nginx']['user'].' ispconfig';
            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/tpl/nginx_ispconfig.vhost.master

@@ -55,7 +55,7 @@
               location ~ ^/squirrelmail/(.+\.php)$ {
                       try_files $uri =404;
                       root /usr/share/;
                       fastcgi_pass 127.0.0.1:9000;
                       fastcgi_pass 127.0.0.1:{fpm_port};
                       {ssl_comment}fastcgi_param  HTTPS {fastcgi_ssl};
                       fastcgi_index index.php;
                       fastcgi_param SCRIPT_FILENAME $request_filename;