From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/system.inc.php | 88 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 12 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index bfc4e09..978a891 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -44,7 +44,7 @@
*/
- public function system(){
+ public function __construct(){
//global $go_info;
//$this->server_id = $go_info['isp']['server_id'];
//$this->server_conf = $go_info['isp']['server_conf'];
@@ -1802,38 +1802,102 @@
}
function mount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh'){
+ global $app, $conf;
+
+ if($this->is_mounted($backup_dir)) return true;
+
$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);
+ exec($mount_cmd);
sleep(1);
if (!$this->is_mounted($backup_dir)) $mounted = false;
}
} else $mounted = false;
+ if (!$mounted) {
+ //* send email to admin that backup directory could not be mounted
+ $global_config = $app->getconf->get_global_config('mail');
+ if($global_config['admin_mail'] != ''){
+ $subject = 'Backup directory '.$backup_dir.' could not be mounted';
+ $message = "Backup directory ".$backup_dir." could not be mounted.\n\nThe command\n\n".$mount_cmd."\n\nfailed.";
+ mail($global_config['admin_mail'], $subject, $message);
+ }
+ }
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';
+
+ function umount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_umount.sh'){
+ global $app, $conf;
+
+ if ( is_file($mount_cmd) &&
+ is_executable($mount_cmd) &&
+ fileowner($mount_cmd) === 0
+ ) {
+ if ($this->is_mounted($backup_dir)){
+ exec($mount_cmd);
+ sleep(1);
+ }
}
+
+ $unmounted = $this->is_mounted($backup_dir) == 0 ? true : false;
+ if(!$unmounted) {
+ //* send email to admin that backup directory could not be unmounted
+ $global_config = $app->getconf->get_global_config('mail');
+ if($global_config['admin_mail'] != ''){
+ $subject = 'Backup directory '.$backup_dir.' could not be unmounted';
+ $message = "Backup directory ".$backup_dir." could not be unmounted.\n\nThe command\n\n".$mount_cmd."\n\nfailed.";
+ mail($global_config['admin_mail'], $subject, $message);
+ }
+ }
+
+ return $unmounted;
+
+ }
+
+ function _getinitcommand($servicename, $action, $init_script_directory = '', $check_service) {
+ global $conf;
// 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')){
+ if ($check_service) {
+ exec("systemctl is-enabled ".$servicename." 2>&1", $out, $ret_val);
+ }
+ if ($ret_val == 0 || !$check_service) {
+ return 'systemctl '.$action.' '.$servicename.'.service';
+ }
+ }
+
// sysvinit
if($init_script_directory == '') $init_script_directory = $conf['init_scripts'];
if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);
- return $init_script_directory.'/'.$servicename.' '.$action;
+ if($check_service && is_executable($init_script_directory.'/'.$servicename)) {
+ return $init_script_directory.'/'.$servicename.' '.$action;
+ }
+ if (!$check_service) {
+ return $init_script_directory.'/'.$servicename.' '.$action;
+ }
}
-
+
+ function getinitcommand($servicename, $action, $init_script_directory = '', $check_service=false) {
+ if (is_array($servicename)) {
+ foreach($servicename as $service) {
+ $out = $this->_getinitcommand($service, $action, $init_script_directory, true);
+ if ($out != '') return $out;
+ }
+ } else {
+ return $this->_getinitcommand($servicename, $action, $init_script_directory, $check_service);
+ }
+ }
+
function getapacheversion($get_minor = false) {
global $app;
@@ -1863,8 +1927,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