maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fixed php-fpm config regeneration when is missing values

Browse Source
This commit is contained in:
Charles Williams (Slydder)
2012-03-17 14:27:03 +01:00
parent 78dce129ff
commit 604b1dc912
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -1298,6 +1298,11 @@ class apache
} }
if($this->settings['phpfpm']['enabled'] == '1') if($this->settings['phpfpm']['enabled'] == '1')
{ {
foreach($this->virtualhosts_data as $vhosts_filename => $vhosts_file)
{
$this->known_vhostfilenames[] = basename($vhosts_filename);
}
foreach($this->known_vhostfilenames as $vhostfilename){ foreach($this->known_vhostfilenames as $vhostfilename){
$known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename); $known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename);
} }
@@ -1349,6 +1354,11 @@ class apache
} }
if($this->settings['phpfpm']['enabled'] == '1') if($this->settings['phpfpm']['enabled'] == '1')
{ {
foreach($this->virtualhosts_data as $vhosts_filename => $vhosts_file)
{
$this->known_vhostfilenames[] = basename($vhosts_filename);
}
foreach($this->known_vhostfilenames as $vhostfilename){ foreach($this->known_vhostfilenames as $vhostfilename){
$known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename); $known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename);
} }
@@ -1358,7 +1368,8 @@ class apache
while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle)))
{ {
if($phpfpm_filename != '.' if(is_array($known_phpfpm_files)
&& $phpfpm_filename != '.'
&& $phpfpm_filename != '..' && $phpfpm_filename != '..'
&& !in_array($phpfpm_filename, $known_phpfpm_files) && !in_array($phpfpm_filename, $known_phpfpm_files)
&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)))
@@ -1367,6 +1378,10 @@ class apache
$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
} }
if(!is_array($known_phpfpm_files))
{
$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!");
}
} }
} }
} }