wok annotate ovz-web-panel/stuff/owp-1.7.u @ rev 12296

Modify WGET_URL
author Stanislas Leduc <shann@slitaz.org>
date Mon Apr 16 12:12:13 2012 +0200 (2012-04-16)
parents
children
rev   line source
erjo@8059 1 --- ovz-web-panel-ori/app/models/hardware_server.rb Fri Nov 19 18:54:08 2010
erjo@8059 2 +++ ovz-web-panel/app/models/hardware_server.rb Fri Dec 31 23:59:40 2010
erjo@8059 3 @@ -174,7 +174,7 @@
erjo@8059 4 end
erjo@8059 5
erjo@8059 6 def sync_backups
erjo@8059 7 - backups_list = rpc_client.exec('ls', "--block-size=M -s #{backups_dir}")['output']
erjo@8059 8 + backups_list = rpc_client.exec('ls', "-h -s #{backups_dir}")['output']
erjo@8059 9 backups_list = backups_list.split("\n")
erjo@8059 10 # remove totals line
erjo@8059 11 backups_list.shift
erjo@8059 12 --- ovz-web-panel-ori/script/owp Mon Oct 25 19:09:40 2010
erjo@8059 13 +++ ovz-web-panel/script/owp Sat Jan 1 01:08:42 2011
erjo@8059 14 @@ -61,7 +61,7 @@
erjo@8059 15
erjo@8059 16 stop() {
erjo@8059 17 echo "Stopping OpenVZ Web Panel server"
erjo@8059 18 - PANEL_APP_PID=`ps auxww | grep ruby | grep script/server | awk '{ print $2 }'`
erjo@8059 19 + PANEL_APP_PID=`ps | grep ruby | grep script/server | awk '{ print $1 }'`
erjo@8059 20 [ -n "$PANEL_APP_PID" ] && kill -2 $PANEL_APP_PID
erjo@8059 21 [ "$ENVIRONMENT" = "HW-NODE" ] && ruby $INSTALL_DIR/utils/hw-daemon/hw-daemon.rb stop
erjo@8059 22 ruby $INSTALL_DIR/utils/watchdog/watchdog.rb stop