Browse Source

minor bugfixes for 0.9.7 release

Serghey Rodin 13 years ago
parent
commit
a12c625091

+ 1 - 1
bin/v_update_sys_ip

@@ -60,7 +60,7 @@ for ip in $ip_list; do
         mask=$(/sbin/ifconfig |grep -w $ip |awk -F "Mask:" '{print $2}')
 
         # Adding vesta ip
-        ip_add_vesta
+        create_vesta_ip
 
         # Adding namehosting support
         namehost_ip_support

+ 2 - 2
bin/v_update_sys_queue

@@ -25,7 +25,7 @@ source $VESTA/func/main.sh
 
 # Export PATH for cron
 PATH=$PATH:$BIN
-export $PATH
+
 
 #----------------------------------------------------------#
 #                    Verifications                         #
@@ -44,7 +44,7 @@ case $queue in
                 rm $VESTA/data/queue/restart.pipe;
                 touch $VESTA/data/queue/restart.pipe;;
     stats)      bash $VESTA/data/queue/stats.pipe;;
-    backup)     bash $VESTA/data/queue/backup.pip;;
+    backup)     bash $VESTA/data/queue/backup.pipe;;
     disk)       bash $VESTA/data/queue/disk.pipe;;
     traffic)    bash $VESTA/data/queue/traffic.pipe;;
     *)          check_args '1' '0' 'queue'

+ 3 - 2
web/templates/admin/list_db.html

@@ -11,8 +11,9 @@ foreach ($data as $key => $value) {
         $spnd_action = 'suspend' ;
     }
 
-    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$_SERVER["HTTP_HOST"]."/phpMyAdmin/";
-    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$_SERVER["HTTP_HOST"]."/phpPgAdmin/";
+    list($http_host, $port) = split(':', $_SERVER["HTTP_HOST"]);
+    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
     ?>
 
 

+ 3 - 2
web/templates/user/list_db.html

@@ -11,8 +11,9 @@ foreach ($data as $key => $value) {
         $spnd_action = 'suspend' ;
     }
 
-    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$_SERVER["HTTP_HOST"]."/phpMyAdmin/";
-    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$_SERVER["HTTP_HOST"]."/phpPgAdmin/";
+    list($http_host, $port) = split(':', $_SERVER["HTTP_HOST"]);
+    if ($data[$key]['TYPE'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
+    if ($data[$key]['TYPE'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
     ?>