diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 9b76e7fe..0d5d74bf 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -44,7 +44,7 @@ class nginx /** * indicator whether a customer is deactivated or not * if yes, only the webroot will be generated - * + * * @var bool */ private $_deactivated = false; @@ -422,6 +422,7 @@ class nginx $vhost_content.= $this->getLogFiles($domain); $vhost_content.= $this->getWebroot($domain, $ssl_vhost); + if ($this->_deactivated == false) { $vhost_content.= $this->create_pathOptions($domain); // $vhost_content.= $this->create_htaccess($domain); diff --git a/scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php b/scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php index d0022df4..90def257 100644 --- a/scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php +++ b/scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php @@ -38,8 +38,8 @@ class nginx_phpfpm extends nginx $phpconfig = $php->getPhpConfig((int)$domain['phpsettingid']); $php_options_text = "\t".'location ~ \.php$ {'."\n"; - $php_options_text.= "\t\t".'fastcgi_index index.php;'."\n"; - $php_options_text.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n"; +// $php_options_text.= "\t\t".'fastcgi_index index.php;'."\n"; +// $php_options_text.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n"; if ($domain['ssl'] == '1' && $ssl_vhost) { $php_options_text.= "\t\t".'fastcgi_param HTTPS on;'."\n"; } @@ -50,7 +50,7 @@ class nginx_phpfpm extends nginx // create starter-file | config-file $php->getInterface()->createConfig($phpconfig); - // create php.ini + // create php.ini // @TODO make php-fpm support this $php->getInterface()->createIniFile($phpconfig); } @@ -70,7 +70,7 @@ class nginx_phpfpm extends nginx $mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown $user = $this->settings['phpfpm']['vhost_httpuser']; - $group = $this->settings['phpfpm']['vhost_httpgroup']; + $group = $this->settings['phpfpm']['vhost_httpgroup']; $domain = array( 'id' => 'none', @@ -99,7 +99,7 @@ class nginx_phpfpm extends nginx // create starter-file | config-file $php->getInterface()->createConfig($phpconfig); - // create php.ini + // create php.ini // @TODO make php-fpm support this $php->getInterface()->createIniFile($phpconfig); }