diff --git a/lng/english.lng.php b/lng/english.lng.php
index 440e9b47..b2b9b7d7 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -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']['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']['description'] = 'Note: Used only when pm is set to \'dynamic\'
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\'
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']['description'] = 'Note: Used only when pm is set to \'dynamic\'
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\'
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']['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';
diff --git a/scripts/froxlor_master_cronjob.php b/scripts/froxlor_master_cronjob.php
index eed10730..9a502bce 100644
--- a/scripts/froxlor_master_cronjob.php
+++ b/scripts/froxlor_master_cronjob.php
@@ -26,8 +26,10 @@ $jobs_to_run = includeCronjobs($debugHandler, $pathtophpfiles);
if(isset($argv[1]) && strtolower($argv[1]) == '--force')
{
$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);
}
}
diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php
index 67a1a601..ba615a06 100644
--- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php
+++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php
@@ -654,7 +654,7 @@ class nginx
$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" . 'try_files $uri $uri/ @rewrites;'."\n";
@@ -665,8 +665,8 @@ class nginx
$webroot_text.= "\t".'}'."\n\n";
$webroot_text.= "\tlocation @rewrites {\n";
- $webroot_text.= "rewrite ^ /index.php last;\n";
- $webroot_text.= "}\n\n";
+ $webroot_text.= "\t\trewrite ^ /index.php last;\n";
+ $webroot_text.= "\t}\n\n";
return $webroot_text;
}