From f7ec00b2f8ba3efc5bdeacef9c813f8a826ae3be Mon Sep 17 00:00:00 2001
From: Patrick Anders <p.anders@timmehosting.de>
Date: Wed, 10 Dec 2014 08:44:26 -0500
Subject: [PATCH] add Spdy option - http://en.wikipedia.org/wiki/SPDY
---
server/lib/classes/system.inc.php | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 113ad5f..75dc73d 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -1801,16 +1801,32 @@
return $return_var == 0 ? true : false;
}
+ function mount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh'){
+ $mounted = true;
+ if ( is_file($mount_cmd) &&
+ is_executable($mount_cmd) &&
+ fileowner($mount_cmd) === 0
+ ) {
+ if (!$this->is_mounted($backup_dir)){
+ exec($backup_dir_mount_cmd);
+ sleep(1);
+ if (!$this->is_mounted($backup_dir)) $mounted = false;
+ }
+ } else $mounted = false;
+
+ return $mounted;
+ }
+
function getinitcommand($servicename, $action, $init_script_directory = ''){
global $conf;
- // systemd
- if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
- return 'systemctl '.$action.' '.$servicename.'.service';
- }
// upstart
if(is_executable('/sbin/initctl')){
exec('/sbin/initctl version 2>/dev/null | /bin/grep -q upstart', $retval['output'], $retval['retval']);
if(intval($retval['retval']) == 0) return 'service '.$servicename.' '.$action;
+ }
+ // systemd
+ if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
+ return 'systemctl '.$action.' '.$servicename.'.service';
}
// sysvinit
if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
@@ -1847,8 +1863,8 @@
global $app;
$cmd = '';
- if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
- elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
+ if($this->is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
+ elseif($this->is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
else {
$app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
return array();
--
Gitblit v1.9.1