- Added more redirect options. - Made jailkit programs configurable per lin...

tbrehm

2009-03-04 838c874d186669867fee81800aaaf29655b4a15f

- Added more redirect options.
- Made jailkit programs configurable per linux distribution in the installer.

 install/dist/conf/centos52.conf.php

@@ -137,5 +137,6 @@
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';

?>

 install/dist/conf/debian40.conf.php

@@ -137,5 +137,7 @@
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';


?>

 install/dist/conf/fedora9.conf.php

@@ -137,5 +137,7 @@
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano';


?>

 install/dist/conf/gentoo.conf.php

@@ -95,5 +95,7 @@
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';


?>

 install/dist/conf/opensuse110.conf.php

@@ -137,5 +137,7 @@
$conf['jailkit']['config_dir'] = '/etc/jailkit';
$conf['jailkit']['jk_init'] = 'jk_init.ini';
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';


?>

 install/lib/installer_base.lib.php

@@ -202,6 +202,8 @@
        // TODO: Update further distribution specific parameters for server config here
        $tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir'];
        $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir'];
        $tpl_ini_array['web']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
		
        
        $server_ini_content = array_to_ini($tpl_ini_array);
        $server_ini_content = mysql_real_escape_string($server_ini_content);
@@ -908,6 +910,12 @@
        $file_server_enabled = ($conf['services']['file'])?1:0;
        $db_server_enabled = ($conf['services']['db'])?1:0;
        $vserver_server_enabled = ($conf['services']['vserver'])?1:0;
		
		
		
		
		
		
        $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
        
        if($conf['mysql']['master_slave_setup'] == 'y') {

 interface/web/sites/form/web_aliasdomain.tform.php

@@ -106,7 +106,7 @@
            'datatype'    => 'VARCHAR',

            'formtype'    => 'SELECT',

            'default'    => 'y',

            'value'        => array('' => 'No redirect', 'R' => 'R', 'L' => 'L')

            'value'        => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L')
        ),

        'redirect_path' => array (

            'datatype'    => 'VARCHAR',


 interface/web/sites/form/web_domain.tform.php

@@ -221,7 +221,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'SELECT',
            'default'    => '',
            'value'        => array('' => 'No redirect', 'R' => 'R', 'L' => 'L')
            'value'        => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L')
        ),
        'redirect_path' => array (
            'datatype'    => 'VARCHAR',

 interface/web/sites/form/web_subdomain.tform.php

@@ -106,7 +106,7 @@
            'datatype'    => 'VARCHAR',
            'formtype'    => 'SELECT',
            'default'    => 'y',
            'value'        => array('' => 'No redirect', 'R' => 'R', 'L' => 'L')
            'value'        => array('' => 'No redirect', 'no' => 'No flag', 'R' => 'R', 'L' => 'L', 'R,L' => 'R,L')
        ),
        'redirect_path' => array (
            'datatype'    => 'VARCHAR',

 server/conf/vhost.conf.master

@@ -124,7 +124,7 @@
    RewriteEngine on
<tmpl_loop name="redirects">
    RewriteCond %{HTTP_HOST}   ^<tmpl_var name='rewrite_domain'> [NC]
    RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  [<tmpl_var name='rewrite_type'>]
    RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  <tmpl_var name='rewrite_type'>
</tmpl_loop>
</tmpl_if>


 server/plugins-available/apache2_plugin.inc.php

@@ -472,13 +472,13 @@
        $rewrite_rules = array();
        if($data["new"]["redirect_type"] != '') {
            $rewrite_rules[] = array(    'rewrite_domain'     => $data["new"]["domain"],
                                        'rewrite_type'         => $data["new"]["redirect_type"],
                                        'rewrite_type'         => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                                        'rewrite_target'     => $data["new"]["redirect_path"]);
            
            switch($data["new"]["subdomain"]) {
            case 'www':
                $rewrite_rules[] = array(    'rewrite_domain'     => 'www.'.$data["new"]["domain"],
                                            'rewrite_type'         => $data["new"]["redirect_type"],
                                            'rewrite_type'         => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                                            'rewrite_target'     => $data["new"]["redirect_path"]);
                break;
            case '*':
@@ -517,12 +517,12 @@
                // Rewriting
                if($alias["redirect_type"] != '') {
                    $rewrite_rules[] = array(    'rewrite_domain'     => $alias["domain"],
                                                'rewrite_type'         => $alias["redirect_type"],
                                                'rewrite_type'         => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                                'rewrite_target'     => $alias["redirect_path"]);
                    switch($alias["subdomain"]) {
                    case 'www':
                        $rewrite_rules[] = array(    'rewrite_domain'     => 'www.'.$alias["domain"],
                                                    'rewrite_type'         => $alias["redirect_type"],
                                                    'rewrite_type'         => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                                    'rewrite_target'     => $alias["redirect_path"]);
                        break;
                    case '*':