Skip to content

Commit 1102cc8

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master install/uninstall.php interface/lib/config.inc.php interface/web/themes/blue/ispconfig_version
2 parents 919c236 + c91c7a6 commit 1102cc8

File tree

9 files changed

+32
-18
lines changed

9 files changed

+32
-18
lines changed

‎install/install.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
$inst->install_crontab();
372372

373373
swriteln('Restarting services ...');
374-
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
374+
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
375375
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
376376
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
377377
if($conf['amavis']['installed'] == true && $conf['amavis']['init_script'] != '') system($inst->getinitcommand($conf['amavis']['init_script'], 'restart'));

‎install/lib/install.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ function get_distname() {
8686
$mainver = array_filter($mainver);
8787
$mainver = current($mainver).'.'.next($mainver);
8888
switch ($mainver){
89+
case "14.10":
90+
$relname = "(Utopic Unicorn)";
91+
break;
8992
case "14.04":
9093
$relname = "(Trusty Tahr)";
9194
break;

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,15 +2361,15 @@ public function cleanup_ispconfig() {
23612361

23622362
public function getinitcommand($servicename, $action, $init_script_directory = ''){
23632363
global $conf;
2364-
// systemd
2365-
if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
2366-
return 'systemctl '.$action.' '.$servicename.'.service';
2367-
}
23682364
// upstart
23692365
if(is_executable('/sbin/initctl')){
23702366
exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
23712367
if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
23722368
}
2369+
// systemd
2370+
if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
2371+
return 'systemctl '.$action.' '.$servicename.'.service';
2372+
}
23732373
// sysvinit
23742374
if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
23752375
if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);

‎install/update.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
//** Restart services:
464464
if($reconfigure_services_answer == 'yes') {
465465
swriteln('Restarting services ...');
466-
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart'));
466+
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
467467
if($conf['services']['mail']) {
468468
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
469469
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));

‎interface/lib/classes/db_mysql.inc.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@ private function securityScan($string) {
179179

180180
if($ids_config['sql_scan_enabled'] == 'yes') {
181181

182+
// Remove whitespace
183+
$string = trim($string);
184+
if(substr($string,-1) == ';') $string = substr($string,0,-1);
185+
186+
// Save original string
182187
$string_orig = $string;
183188

184189
//echo $string;

‎interface/lib/classes/tform_actions.inc.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ function onUpdate() {
112112
$sql = $app->tform->getSQL($this->dataRecord, $app->tform->getCurrentTab(), 'UPDATE', $this->id, $ext_where);
113113
if($app->tform->errorMessage == '') {
114114

115-
if($app->tform->formDef['db_history'] == 'yes') {
116-
$this->oldDataRecord = $app->tform->getDataRecord($this->id);
117-
}
115+
$this->oldDataRecord = $app->tform->getDataRecord($this->id);
118116

119117
// Save record in database
120118
$this->onUpdateSave($sql);

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public function get_distname() {
6262
$mainver = array_filter($mainver);
6363
$mainver = current($mainver).'.'.next($mainver);
6464
switch ($mainver){
65+
case "14.10":
66+
$relname = "(Utopic Unicorn)";
67+
break;
6568
case "14.04":
6669
$relname = "(Trusty Tahr)";
6770
break;

‎server/lib/classes/system.inc.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,15 +1803,15 @@ function is_mounted($mountpoint){
18031803

18041804
function getinitcommand($servicename, $action, $init_script_directory = ''){
18051805
global $conf;
1806-
// systemd
1807-
if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
1808-
return 'systemctl '.$action.' '.$servicename.'.service';
1809-
}
18101806
// upstart
18111807
if(is_executable('/sbin/initctl')){
18121808
exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
18131809
if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
18141810
}
1811+
// systemd
1812+
if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
1813+
return 'systemctl '.$action.' '.$servicename.'.service';
1814+
}
18151815
// sysvinit
18161816
if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
18171817
if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);
@@ -1847,8 +1847,8 @@ function getapachemodules() {
18471847
global $app;
18481848

18491849
$cmd = '';
1850-
if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
1851-
elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
1850+
if($this->is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
1851+
elseif($this->is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
18521852
else {
18531853
$app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
18541854
return array();

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,8 +1378,10 @@ function update($event_name, $data) {
13781378
$socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
13791379
if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
13801380

1381-
// User sockets, but not with apache 2.4 as socket support is buggy in that version
1382-
if($data['new']['php_fpm_use_socket'] == 'y' && $app->system->getapacheversion() < 2.4){
1381+
$apache_modules = $app->system->getapachemodules();
1382+
1383+
// Use sockets, but not with apache 2.4 on centos (mod_proxy_fcgi) as socket support is buggy in that version
1384+
if($data['new']['php_fpm_use_socket'] == 'y' && in_array('fastcgi_module',$apache_modules)){
13831385
$use_tcp = 0;
13841386
$use_socket = 1;
13851387
} else {
@@ -2827,7 +2829,10 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
28272829
$tpl->newTemplate('php_fpm_pool.conf.master');
28282830
$tpl->setVar('apache_version', $app->system->getapacheversion());
28292831

2830-
if($data['new']['php_fpm_use_socket'] == 'y'){
2832+
$apache_modules = $app->system->getapachemodules();
2833+
2834+
// Use sockets, but not with apache 2.4 on centos (mod_proxy_fcgi) as socket support is buggy in that version
2835+
if($data['new']['php_fpm_use_socket'] == 'y' && in_array('fastcgi_module',$apache_modules)){
28312836
$use_tcp = 0;
28322837
$use_socket = 1;
28332838
if(!is_dir($socket_dir)) $app->system->mkdirpath($socket_dir);

0 commit comments

Comments
 (0)