Bugfixes in installer and apache plugin.

tbrehm

2011-09-22 dba68fcdf2d3e25ad1f3301fcb128edfb3da745b

Bugfixes in installer and apache plugin.

 install/lib/installer_base.lib.php

@@ -233,7 +233,6 @@
        $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
        $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
        
        if ($conf['nginx']['installed'] == true) {
            $tpl_ini_array['web']['nginx_vhost_conf_dir'] = $conf['nginx']['vhost_conf_dir'];
            $tpl_ini_array['web']['nginx_vhost_conf_enabled_dir'] = $conf['nginx']['vhost_conf_enabled_dir'];
            $tpl_ini_array['web']['nginx_user'] = $conf['nginx']['user'];
@@ -244,6 +243,8 @@
            $tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];
            $tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];
            $tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
		
        if ($conf['nginx']['installed'] == true) {
            $tpl_ini_array['web']['server_type'] = 'nginx';
            $tpl_ini_array['global']['webserver'] = 'nginx';
        }

 install/lib/update.lib.php

@@ -260,7 +260,6 @@
    $tpl_ini_array['dns']['named_conf_path'] = $conf['bind']['named_conf_path'];
    $tpl_ini_array['dns']['named_conf_local_path'] = $conf['bind']['named_conf_local_path'];
    
    if ($conf['nginx']['installed'] == true) {
        $tpl_ini_array['web']['nginx_vhost_conf_dir'] = $conf['nginx']['vhost_conf_dir'];
        $tpl_ini_array['web']['nginx_vhost_conf_enabled_dir'] = $conf['nginx']['vhost_conf_enabled_dir'];
        $tpl_ini_array['web']['nginx_user'] = $conf['nginx']['user'];
@@ -271,6 +270,8 @@
        $tpl_ini_array['web']['php_fpm_pool_dir'] = $conf['nginx']['php_fpm_pool_dir'];
        $tpl_ini_array['web']['php_fpm_start_port'] = $conf['nginx']['php_fpm_start_port'];
        $tpl_ini_array['web']['php_fpm_socket_dir'] = $conf['nginx']['php_fpm_socket_dir'];
		
    if ($conf['nginx']['installed'] == true) {
        $tpl_ini_array['web']['server_type'] = 'nginx';
        $tpl_ini_array['global']['webserver'] = 'nginx';
    }

 server/conf/squidRewriteRules.py.master

File was deleted

 server/plugins-available/apache2_plugin.inc.php

@@ -290,6 +290,23 @@
            return 0;
        }

        // Create group and user, if not exist
        $app->uses('system');

        $groupname = escapeshellcmd($data['new']['system_group']);
        if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
            exec('groupadd '.$groupname);
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
            $app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
        }

        $username = escapeshellcmd($data['new']['system_user']);
        if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
            exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            $app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
        }

        //* If the client of the site has been changed, we have a change of the document root
        if($this->action == 'update' && $data['new']['document_root'] != $data['old']['document_root']) {

@@ -510,23 +527,6 @@
            exec('chmod -R a+r '.$error_page_path);
            exec('chown -R '.$data['new']['system_user'].':'.$data['new']['system_group'].' '.$error_page_path);
        }  // end copy error docs

        // Create group and user, if not exist
        $app->uses('system');

        $groupname = escapeshellcmd($data['new']['system_group']);
        if($data['new']['system_group'] != '' && !$app->system->is_group($data['new']['system_group'])) {
            exec('groupadd '.$groupname);
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' groupadd '.$groupname);
            $app->log('Adding the group: '.$groupname,LOGLEVEL_DEBUG);
        }

        $username = escapeshellcmd($data['new']['system_user']);
        if($data['new']['system_user'] != '' && !$app->system->is_user($data['new']['system_user'])) {
            exec('useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            if($apache_chrooted) $this->_exec('chroot '.escapeshellcmd($web_config['website_basedir']).' useradd -d '.escapeshellcmd($data['new']['document_root'])." -g $groupname -G sshusers $username -s /bin/false");
            $app->log('Adding the user: '.$username,LOGLEVEL_DEBUG);
        }

        // Set the quota for the user
        if($username != '' && $app->system->is_user($username)) {