Merge branch 'csr_challenge_password' into 'master'

Marius Cramer

2015-07-30 1271ad0e6995d021f5265365d1528709b3b9bb33

 server/plugins-available/apache2_plugin.inc.php

@@ -283,7 +283,7 @@
        emailAddress           = webmaster@".$data['new']['domain']."

        [ req_attributes ]
        challengePassword              = A challenge password";
        ";//challengePassword              = A challenge password";

         $ssl_cnf_file = $ssl_dir.'/openssl.conf';
         $app->system->file_put_contents($ssl_cnf_file, $ssl_cnf);
@@ -594,7 +594,7 @@
            }
            
            //* Unmount the old log directory bfore we move the log dir
            exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
            //exec('fuser -km '.escapeshellcmd($old_dir.'/log'));
            exec('umount '.escapeshellcmd($old_dir.'/log'));

            //* Create new base directory, if it does not exist yet
@@ -677,7 +677,7 @@
         $app->system->removeLine('/etc/fstab', $fstab_line);

         //* Unmount log directory
         exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
         //exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
         exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$old_log_folder));
      }

@@ -1902,12 +1902,12 @@
         if(is_array($log_folders) && !empty($log_folders)){
            foreach($log_folders as $log_folder){
               //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
               exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
               //exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
               exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
            }
         } else {
            //if($app->system->is_mounted($data['old']['document_root'].'/'.$log_folder)) exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
            exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
            //exec('fuser -km '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
            exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder).' 2>/dev/null');
         }
      }