# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1295999835 -3600
# Node ID 18ceed3eef8dca25b7fb546d85930a861482b99a
# Parent  c0a034d67b5eb315bdff445f0ebba20afda13077
rm ovz-web-panel: move to wok

diff -r c0a034d67b5e -r 18ceed3eef8d ovz-web-panel/receipt
--- a/ovz-web-panel/receipt	Wed Jan 26 00:56:28 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ovz-web-panel"
-VERSION="1.7"
-CATEGORY="networking"
-SHORT_DESC="GUI web-based frontend for OpenVZ"
-MAINTAINER="erjo@slitaz.org"
-DEPENDS="ruby rubygems sqlite3-ruby"
-TARBALL="${PACKAGE}-${VERSION}.tgz"
-WEB_SITE="http://code.google.com/p/ovz-web-panel/"
-WGET_URL="http://ovz-web-panel.googlecode.com/files/$TARBALL"
-
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $PACKAGE
-	# Apply patches
-	while read patch_file; do
-		if [ -f done.$patch_file ]; then
-			echo "Skipping $patch_file"
-			continue
-		fi
-		echo "Apply $patch_file"
-		patch -p1 < ../stuff/$patch_file || exit 1
-		touch done.$patch_file
-	done <<EOT
-owp-${VERSION}.u
-EOT
-	
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share \
-		$fs/etc 
-				
-	cp -a $PACKAGE $fs/usr/share
-	cp -a $fs/usr/share/$PACKAGE/config/owp.conf.sample $fs/etc/owp.conf
-	cp -a $fs/usr/share//$PACKAGE/utils/hw-daemon/hw-daemon.ini.sample $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini
-	
-	# Set secret key
-	sed -i 's/secret/2918b7aafc1f5f753ee232a7e7f78175/' \
-		$fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini
-	
-	# Set program homedir
-	sed -i 's!/opt!/usr/share!' $fs/etc/owp.conf
-	
-	# Fix perms
-	chmod 755 $fs/usr/share/$PACKAGE/script/owp
-}
-
-post_install()
-{
-	echo "Processing post-install commands..."	
-	chroot "$1/" ln -s /usr/share/$PACKAGE/script/owp /etc/init.d/owp
-}
-
-clean_wok()
-{
-	[ -d $PACKAGE ] && rm -rf $PACKAGE
-}
diff -r c0a034d67b5e -r 18ceed3eef8d ovz-web-panel/stuff/hardware_server.rb.u
--- a/ovz-web-panel/stuff/hardware_server.rb.u	Wed Jan 26 00:56:28 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- ovz-web-panel-ori/app/models/hardware_server.rb	Fri Nov 19 18:54:08 2010
-+++ ovz-web-panel/app/models/hardware_server.rb	Fri Dec 31 23:59:40 2010
-@@ -174,7 +174,7 @@
-   end
-   
-   def sync_backups
--    backups_list = rpc_client.exec('ls', "--block-size=M -s #{backups_dir}")['output']
-+    backups_list = rpc_client.exec('ls', "-h -s #{backups_dir}")['output']
-     backups_list = backups_list.split("\n")
-     # remove totals line
-     backups_list.shift
diff -r c0a034d67b5e -r 18ceed3eef8d ovz-web-panel/stuff/owp-1.7.u
--- a/ovz-web-panel/stuff/owp-1.7.u	Wed Jan 26 00:56:28 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- ovz-web-panel-ori/app/models/hardware_server.rb	Fri Nov 19 18:54:08 2010
-+++ ovz-web-panel/app/models/hardware_server.rb	Fri Dec 31 23:59:40 2010
-@@ -174,7 +174,7 @@
-   end
-   
-   def sync_backups
--    backups_list = rpc_client.exec('ls', "--block-size=M -s #{backups_dir}")['output']
-+    backups_list = rpc_client.exec('ls', "-h -s #{backups_dir}")['output']
-     backups_list = backups_list.split("\n")
-     # remove totals line
-     backups_list.shift
---- ovz-web-panel-ori/script/owp	Mon Oct 25 19:09:40 2010
-+++ ovz-web-panel/script/owp	Sat Jan  1 01:08:42 2011
-@@ -61,7 +61,7 @@
- 
- stop() {
-   echo "Stopping OpenVZ Web Panel server"
--  PANEL_APP_PID=`ps auxww | grep ruby | grep script/server | awk '{ print $2 }'`
-+  PANEL_APP_PID=`ps  | grep ruby | grep script/server | awk '{ print $1 }'`
-   [ -n "$PANEL_APP_PID" ] && kill -2 $PANEL_APP_PID
-   [ "$ENVIRONMENT" = "HW-NODE" ] && ruby $INSTALL_DIR/utils/hw-daemon/hw-daemon.rb stop
-   ruby $INSTALL_DIR/utils/watchdog/watchdog.rb stop