tbrehm
2008-01-06 1b063ee9dc97ab39049d7396ca87ba506435aca0
Moved server modules and plugins to new directory and updated the installer to create the symlinks for the modules and plugins from *-available to *-enabled directory.
Fixed a typo in mailfilter template.
2 files modified
11 files renamed
39 ■■■■ changed files
install/lib/installer_base.lib.php 37 ●●●● patch | view | raw | blame | history
install/tpl/mailfilter.master 2 ●●● patch | view | raw | blame | history
server/mods-available/client_module.inc.php patch | view | raw | blame | history
server/mods-available/mail_module.inc.php patch | view | raw | blame | history
server/mods-available/server_module.inc.php patch | view | raw | blame | history
server/mods-available/web_module.inc.php patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/getmail_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/maildrop_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/postfix_filter_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/postfix_server_plugin.inc.php patch | view | raw | blame | history
server/plugins-available/shelluser_plugin.inc.php patch | view | raw | blame | history
install/lib/installer_base.lib.php
@@ -42,7 +42,7 @@
        $this->conf = $conf;
    }
    
    //TODO  uh ?
    //: TODO  Implement the translation function and langauge files for the installer.
    public function lng($text)
    {
        return $text;
@@ -100,19 +100,15 @@
        return $answer;
    }
    
    /*
    // TODO: this function is not used atmo I think - pedro
    function request_language(){
        
        swriteln(lng('Enter your language'));
        swriteln(lng('de, en'));
        
        /*
        do {
            $lang = sread(2);
        } while (!$this->check_break($lang) or $this->
        */
    }
    */
    
    /** Create the database for ISPConfig */ 
    public function configure_database()
@@ -608,6 +604,31 @@
        $content = str_replace('{server_id}', $this->conf['server_id'], $content);
        wf("$install_dir/server/lib/$configfile", $content);
        
        //* Enable the server modules and plugins.
        // TODO: Implement a selector which modules and plugins shall be enabled.
        $dir = $install_dir.'/server/mods-available/';
        if (is_dir($dir)) {
            if ($dh = opendir($dir)) {
                while (($file = readdir($dh)) !== false) {
                    if($file != '.' && $file != '..') {
                        symlink($install_dir.'/server/mods-enabled/'.$file,$install_dir.'/server/mods-available/'.$file)
                    }
                }
                closedir($dh);
            }
        }
        $dir = $install_dir.'/server/plugins-available/';
        if (is_dir($dir)) {
            if ($dh = opendir($dir)) {
                while (($file = readdir($dh)) !== false) {
                    if($file != '.' && $file != '..') {
                        symlink($install_dir.'/server/plugins-enabled/'.$file,$install_dir.'/server/plugins-available/'.$file)
                    }
                }
                closedir($dh);
            }
        }
        
        //* Chmod the files
        $command = "chmod -R 750 $install_dir";
@@ -632,7 +653,7 @@
        caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
        
        //* Copy the ISPConfig vhost for the controlpanel
        //TODO These are missing! should they be "vhost_dist_*_dir" ?
        // TODO: These are missing! should they be "vhost_dist_*_dir" ?
        $vhost_conf_dir = $this->conf['apache']['vhost_conf_dir'];
        $vhost_conf_enabled_dir = $this->conf['apache']['vhost_conf_enabled_dir'];
        copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
install/tpl/mailfilter.master
@@ -50,7 +50,7 @@
#
# Check that user has his own maildrop include,
# Test if the user has his own maildrop include,
# if not available, check if $DEFAULT is set
# (newer maildrop get's that from the DB and updates
# it) and deliver or fail temporarily if not available
server/mods-available/client_module.inc.php
server/mods-available/mail_module.inc.php
server/mods-available/server_module.inc.php
server/mods-available/web_module.inc.php
server/plugins-available/apache2_plugin.inc.php
server/plugins-available/getmail_plugin.inc.php
server/plugins-available/mail_plugin.inc.php
server/plugins-available/maildrop_plugin.inc.php
server/plugins-available/postfix_filter_plugin.inc.php
server/plugins-available/postfix_server_plugin.inc.php
server/plugins-available/shelluser_plugin.inc.php