tbrehm
2010-05-26 7f2bb38064a377e2278ed29c4d162f20a5bb8c3d
Merged revisions 1699-1700,1705 from trunk.
4 files modified
40 ■■■■ changed files
docs/INSTALL_DEBIAN_5.0_courier_mydns.txt 23 ●●●●● patch | view | raw | blame | history
server/conf/vhost.conf.master 8 ●●●● patch | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 7 ●●●●● patch | view | raw | blame | history
server/plugins-available/shelluser_jailkit_plugin.inc.php 2 ●●● patch | view | raw | blame | history
docs/INSTALL_DEBIAN_5.0_courier_mydns.txt
@@ -1,4 +1,4 @@
Installation
-----------
# It is recommended to use a clean (fresh) Debian lenny install where you just selected "Standard System" as the package selection during
@@ -345,27 +345,6 @@
-----------------------------------------------------------------------------------------------------------
Ispc log files rotate, for now manual add but to add in ispc installer:
/etc/logrotate.d/logispc3
/var/log/ispconfig/ispconfig.log {
    weekly
    missingok
    rotate 4
    compress
    delaycompress
}
/var/log/ispconfig/cron.log {
    weekly
    missingok
    rotate 4
    compress
    delaycompress
}
-----------------------------------------------------------------------------------------------------------
Possible errors and their solutions
------------------------------------
server/conf/vhost.conf.master
@@ -184,7 +184,7 @@
  </tmpl_if>
</tmpl_if>
    ServerName <tmpl_var name='domain'>
    ServerName <tmpl_var name='ssl_domain'>
<tmpl_if name='alias'>
    <tmpl_var name='alias'>
</tmpl_if>
@@ -203,10 +203,10 @@
</tmpl_if>
    SSLEngine on
    SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.crt
    SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.key
    SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
    SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
<tmpl_if name='has_bundle_cert'>
    SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='domain'>.bundle
    SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
</tmpl_if>
    
    <Directory {tmpl_var name='web_document_root_www'}>
server/plugins-available/apache2_plugin.inc.php
@@ -157,7 +157,7 @@
        //* Save a SSL certificate to disk
        if($data["new"]["ssl_action"] == 'save') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["domain"];
            $domain = $data["new"]["ssl_domain"];
              $csr_file = $ssl_dir.'/'.$domain.".csr";
              $crt_file = $ssl_dir.'/'.$domain.".crt";
            $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -174,7 +174,7 @@
        //* Delete a SSL certificate
        if($data["new"]["ssl_action"] == 'del') {
            $ssl_dir = $data["new"]["document_root"]."/ssl";
            $domain = $data["new"]["domain"];
            $domain = $data["new"]["ssl_domain"];
              $csr_file = $ssl_dir.'/'.$domain.".csr";
              $crt_file = $ssl_dir.'/'.$domain.".crt";
            $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -556,10 +556,11 @@
        $vhost_data["security_level"] = $web_config["security_level"];
        $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
        $vhost_data["php_open_basedir"] = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];
        $vhost_data["ssl_domain"] = $data["new"]["ssl_domain"];
        
        // Check if a SSL cert exists
        $ssl_dir = $data["new"]["document_root"]."/ssl";
        $domain = $data["new"]["domain"];
        $domain = $data["new"]["ssl_domain"];
          $key_file = $ssl_dir.'/'.$domain.".key";
          $crt_file = $ssl_dir.'/'.$domain.".crt";
        $bundle_file = $ssl_dir.'/'.$domain.".bundle";
server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -160,7 +160,7 @@
            //exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
            
            if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
                $command = 'userdel -f -r';
                $command = 'userdel -f';
                $command .= ' '.escapeshellcmd($data['old']['username']);
                exec($command);
                $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);