- Fixed FS#2318 - Starting nginx nginx: [emerg] duplicate listen options fo...

ftimme

2012-09-05 f2ded16c1b28b471a5864aa7cfb96f68c44118f8

 server/plugins-available/cron_jailkit_plugin.inc.php

@@ -116,6 +116,8 @@
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $app->system->web_folder_protection($parent_domain['document_root'],false);
				
            $this->_update_website_security_level();
         
            $this->_setup_jailkit_chroot();
@@ -126,6 +128,8 @@
            exec($command);
            
            $this->_update_website_security_level();
				
            $app->system->web_folder_protection($parent_domain['document_root'],true);
         }
      
         $app->log("Jailkit Plugin (Cron) -> insert username:".$parent_domain['system_user'],LOGLEVEL_DEBUG);
@@ -182,12 +186,14 @@
            $this->app = $app;
            $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
            
            $app->system->web_folder_protection($parent_domain['document_root'],false);
            $this->_update_website_security_level();
         
            $this->_setup_jailkit_chroot();
            $this->_add_jailkit_user();
            
            $this->_update_website_security_level();
            $app->system->web_folder_protection($parent_domain['document_root'],true);
         }
      
         $app->log("Jailkit Plugin (Cron) -> update username:".$parent_domain['system_user'],LOGLEVEL_DEBUG);
@@ -230,20 +236,20 @@
                $tpl->setVar('home_dir',$this->_get_home_dir(""));
            
            $bashrc = escapeshellcmd($this->parent_domain['document_root']).'/etc/bash.bashrc';
            if(@is_file($bashrc)) exec('rm '.$bashrc);
            if(@is_file($bashrc)) unlink($bashrc);
            
            file_put_contents($bashrc,$tpl->grab());
            unset($tpl);
            
            $this->app->log("Added bashrc scrpt : ".$bashrc,LOGLEVEL_DEBUG);
            $this->app->log('Added bashrc script: '.$bashrc,LOGLEVEL_DEBUG);
            
            $tpl = new tpl();
            $tpl->newTemplate("motd.master");
            $tpl->newTemplate('motd.master');
            
            $tpl->setVar('domain',$this->parent_domain['domain']);
            
            $motd = escapeshellcmd($this->parent_domain['document_root']).'/var/run/motd';
            if(@is_file($motd)) exec('rm '.$motd);
            if(@is_file($motd)) unlink($motd);
            
            file_put_contents($motd,$tpl->grab());
            
@@ -290,7 +296,10 @@
            
         $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
            
         exec("mkdir -p ".escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome));
         mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true);
         chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user']));
         chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group']));
			
   }
   
    function _get_home_dir($username)
@@ -308,8 +317,8 @@
            
      //* If the security level is set to high
      if($web_config['security_level'] == 20) {
         $this->_exec("chmod 755 ".escapeshellcmd($this->parent_domain['document_root']));
         $this->_exec("chown root:root ".escapeshellcmd($this->parent_domain['document_root']));
         $this->_exec('chmod 755 '.escapeshellcmd($this->parent_domain['document_root']));
         $this->_exec('chown root:root '.escapeshellcmd($this->parent_domain['document_root']));
      }
      
   }
@@ -317,7 +326,7 @@
   //* Wrapper for exec function for easier debugging
   private function _exec($command) {
      global $app;
      $app->log("exec: ".$command,LOGLEVEL_DEBUG);
      $app->log('exec: '.$command,LOGLEVEL_DEBUG);
      exec($command);
   }