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

fix fpm-description in english langfile; make --force command really force a regeneration of the config files by inserting the task; beautify nginx customer vhost

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-03-09 16:59:33 +01:00
parent b84bd2017c
commit 2a48c2b598
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lng/english.lng.php
View File

@@ -1534,9 +1534,9 @@ $lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'The
$lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'The number of child processes created on startup'; $lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'The number of child processes created on startup';
$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\''; $lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\'';
$lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'The desired minimum number of idle server processes'; $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'The desired minimum number of idle server processes';
$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'<br />Note: Mandatory when pm is set to \'dynamic/ondemand\''; $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\'<br />Note: Mandatory when pm is set to \'dynamic/ondemand\'';
$lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'The desired maximum number of idle server processes'; $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'The desired maximum number of idle server processes';
$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'<br />Note: Mandatory when pm is set to \'dynamic/ondemand\''; $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic/ondemand\'<br />Note: Mandatory when pm is set to \'dynamic/ondemand\'';
$lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests per child before respawning'; $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests per child before respawning';
$lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'For endless request processing specify \'0\'. Equivalent to PHP_FCGI_MAX_REQUESTS.'; $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'For endless request processing specify \'0\'. Equivalent to PHP_FCGI_MAX_REQUESTS.';
$lng['error']['phpfpmstillenabled'] = 'PHP-FPM is currently active. Please deactivate it before activating FCGID'; $lng['error']['phpfpmstillenabled'] = 'PHP-FPM is currently active. Please deactivate it before activating FCGID';

6
scripts/froxlor_master_cronjob.php
View File

@@ -26,8 +26,10 @@ $jobs_to_run = includeCronjobs($debugHandler, $pathtophpfiles);
if(isset($argv[1]) && strtolower($argv[1]) == '--force') if(isset($argv[1]) && strtolower($argv[1]) == '--force')
{ {
$crontasks = makeCorrectFile($pathtophpfiles.'/scripts/jobs/cron_tasks.php'); $crontasks = makeCorrectFile($pathtophpfiles.'/scripts/jobs/cron_tasks.php');
if(!in_array($crontasks, $jobs_to_run)) // really force re-generating of config-files by
{ // inserting task 1
inserttask('1');
if (!in_array($crontasks, $jobs_to_run)) {
array_unshift($jobs_to_run, $crontasks); array_unshift($jobs_to_run, $crontasks);
} }
} }

6
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -654,7 +654,7 @@ class nginx
$this->_deactivated = false; $this->_deactivated = false;
} }
$webroot_text.= "\t".'location / {'."\n"; $webroot_text.= "\n\t".'location / {'."\n";
$webroot_text.= "\t\t".'index index.php index.html index.htm;'."\n"; $webroot_text.= "\t\t".'index index.php index.html index.htm;'."\n";
$webroot_text.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n"; $webroot_text.= "\t\t" . 'try_files $uri $uri/ @rewrites;'."\n";
@@ -665,8 +665,8 @@ class nginx
$webroot_text.= "\t".'}'."\n\n"; $webroot_text.= "\t".'}'."\n\n";
$webroot_text.= "\tlocation @rewrites {\n"; $webroot_text.= "\tlocation @rewrites {\n";
$webroot_text.= "rewrite ^ /index.php last;\n"; $webroot_text.= "\t\trewrite ^ /index.php last;\n";
$webroot_text.= "}\n\n"; $webroot_text.= "\t}\n\n";
return $webroot_text; return $webroot_text;
} }