Serghey Rodin 12 лет назад
Родитель
Сommit
8f03ce5e43
8 измененных файлов с 41 добавлено и 8 удалено
  1. 5 1
      bin/v-backup-user
  2. 5 1
      bin/v-restart-cron
  3. 5 1
      bin/v-restart-ftp
  4. 5 1
      bin/v-restart-mail
  5. 5 1
      bin/v-restart-proxy
  6. 5 1
      bin/v-restart-service
  7. 5 1
      bin/v-restart-web
  8. 6 1
      bin/v-restore-user

+ 5 - 1
bin/v-backup-user

@@ -53,7 +53,11 @@ else
     subj="$user → backup failed"
     email=$(grep CONTACT $VESTA/data/users/admin/user.conf | cut -f 2 -d \')
 fi
-send_mail="$VESTA/web/inc/mail-wrapper.php"
+if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+    send_mail="$VESTA/web/inc/mail-wrapper.php"
+else
+    send_mail=$(which mail)
+fi
 
 # Check load average
 la=$(cat /proc/loadavg | cut -f 1 -d ' ' | cut -f 1 -d '.')

+ 5 - 1
bin/v-restart-cron

@@ -34,7 +34,11 @@ if [ ! -z "$CRON_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$CRON_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
+            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+                send_mail="$VESTA/web/inc/mail-wrapper.php"
+            else
+                send_mail=$(which mail)
+            fi
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

+ 5 - 1
bin/v-restart-ftp

@@ -34,7 +34,11 @@ if [ ! -z "$FTP_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
+            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+                send_mail="$VESTA/web/inc/mail-wrapper.php"
+            else
+                send_mail=$(which mail)
+            fi
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

+ 5 - 1
bin/v-restart-mail

@@ -34,7 +34,11 @@ if [ ! -z "$MAIL_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
+            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+                send_mail="$VESTA/web/inc/mail-wrapper.php"
+            else
+                send_mail=$(which mail)
+            fi
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

+ 5 - 1
bin/v-restart-proxy

@@ -34,7 +34,11 @@ if [ ! -z "$PROXY_SYSTEM" ]; then
     if [ $? -ne 0 ]; then
         /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
+            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+                send_mail="$VESTA/web/inc/mail-wrapper.php"
+            else
+                send_mail=$(which mail)
+            fi
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

+ 5 - 1
bin/v-restart-service

@@ -30,7 +30,11 @@ check_args '1' "$#" 'SERVICE'
 if [ -x "/etc/init.d/$service" ]; then
     /etc/init.d/$service restart >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-        send_mail="$VESTA/web/inc/mail-wrapper.php"
+        if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+            send_mail="$VESTA/web/inc/mail-wrapper.php"
+        else
+            send_mail=$(which mail)
+        fi
         email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
         email=$(echo "$email" | cut -f 2 -d "'")
         tmpfile=$(mktemp)

+ 5 - 1
bin/v-restart-web

@@ -34,7 +34,11 @@ if [ ! -z "$WEB_SYSTEM" ]; then
     if [ "$?" -ne 0 ]; then
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
-            send_mail="$VESTA/web/inc/mail-wrapper.php"
+            if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+                send_mail="$VESTA/web/inc/mail-wrapper.php"
+            else
+                send_mail=$(which mail)
+            fi
             email=$(grep CONTACT $VESTA/data/users/admin/user.conf)
             email=$(echo "$email" | cut -f 2 -d "'")
             tmpfile=$(mktemp)

+ 6 - 1
bin/v-restore-user

@@ -62,7 +62,12 @@ is_backup_available
 #----------------------------------------------------------#
 
 # Define email wrapper
-send_mail="$VESTA/web/inc/mail-wrapper.php"
+if [ -e "$VESTA/web/inc/mail-wrapper.php" ]; then
+    send_mail="$VESTA/web/inc/mail-wrapper.php"
+else
+    send_mail=$(which mail)
+fi
+
 
 # Check user
 check_user=$(is_object_valid 'user' 'USER' "$user")