wok-6.x view ovz-web-panel/stuff/owp-1.7.u @ rev 9486
Up: pango to 1.28.4.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Tue Apr 05 11:48:25 2011 +0000 (2011-04-05) |
| parents | |
| children |
line source
1 --- ovz-web-panel-ori/app/models/hardware_server.rb Fri Nov 19 18:54:08 2010
2 +++ ovz-web-panel/app/models/hardware_server.rb Fri Dec 31 23:59:40 2010
3 @@ -174,7 +174,7 @@
4 end
6 def sync_backups
7 - backups_list = rpc_client.exec('ls', "--block-size=M -s #{backups_dir}")['output']
8 + backups_list = rpc_client.exec('ls', "-h -s #{backups_dir}")['output']
9 backups_list = backups_list.split("\n")
10 # remove totals line
11 backups_list.shift
12 --- ovz-web-panel-ori/script/owp Mon Oct 25 19:09:40 2010
13 +++ ovz-web-panel/script/owp Sat Jan 1 01:08:42 2011
14 @@ -61,7 +61,7 @@
16 stop() {
17 echo "Stopping OpenVZ Web Panel server"
18 - PANEL_APP_PID=`ps auxww | grep ruby | grep script/server | awk '{ print $2 }'`
19 + PANEL_APP_PID=`ps | grep ruby | grep script/server | awk '{ print $1 }'`
20 [ -n "$PANEL_APP_PID" ] && kill -2 $PANEL_APP_PID
21 [ "$ENVIRONMENT" = "HW-NODE" ] && ruby $INSTALL_DIR/utils/hw-daemon/hw-daemon.rb stop
22 ruby $INSTALL_DIR/utils/watchdog/watchdog.rb stop