--- a/fabfile.py	Thu Sep 27 17:13:19 2012 +0200
+++ b/fabfile.py	Thu Sep 27 17:14:27 2012 +0200
@@ -28,6 +28,8 @@
 ngmodules = {"directory": "/home/hefee/hg/ngmod/init",
         "version":ngdatabase.__version__}
 
+env.use_ssh_config = True
+
 def vbox():
     env.hosts = ['192.168.56.101']
     env.directory = '/home/hefee/iro/'
@@ -39,6 +41,13 @@
     env.hosts = ['sandy@hal.netzguerilla.net']
     env.directory = "iro"
 
+def iro():
+    env.hosts = ['hal']
+    env.directory = '/home/sandy/virtualenv/iro2/'
+    env.activate = 'source /home/sandy/virtualenv/iro2/bin/activate'
+    env.deploy_user = 'sandy'
+
+
 def prepare_deploy():
     local("python setup.py sdist")
 
@@ -48,8 +57,9 @@
 def deploy():
     prepare_deploy()
     put("dist/iro-%s.tar.gz"%__version__,"%s/dist/"%env.directory)
-    put("%(directory)s/dist/ngmodules-%(version)s-py2.7.egg"%ngmodules,"%s/dist/"%env.directory)
-    virtualenv("easy_install %s/dist/ngmodules-%s-py2.7.egg"%(env.directory,ngmodules["version"]))
+    put("%(directory)s/dist/ngmodules-%(version)s.tar.gz"%ngmodules,"%s/dist/"%env.directory)
+    virtualenv("pip install %s/dist/ngmodules-%s.tar.gz"%(env.directory,ngmodules["version"]))
+    virtualenv("pip install -e 'git+git://github.com/hefee/txjsonrpc.git#egg=txjsonrpc'")
     virtualenv("pip uninstall -y iro")
     virtualenv("pip install %s/dist/iro-%s.tar.gz"%(env.directory,__version__))
 

--- a/setup.py	Thu Sep 27 17:13:19 2012 +0200
+++ b/setup.py	Thu Sep 27 17:14:27 2012 +0200
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 # Copyright (c) 2012 netzguerilla.net <iro@netzguerilla.net>
 # 
 # This file is part of Iro.
@@ -19,7 +21,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# -*- coding: utf-8 -*-
 
 from setuptools import setup
 from iro import __version__
@@ -32,7 +33,7 @@
         version=__version__,
         packages=['iro','iro.controller','iro.view','iro.model','iro.offer','iro.tests', 'iro.test_helpers','twisted.plugins'],
         setup_requires = ["ngmodules>=0.2","mock"],
-        install_requires=['twisted>=11.1.0',"ConfigParser","sqlalchemy","MySQL-python","SOAPpy",'decorator'],
+        install_requires=['twisted>=11.1.0',"ConfigParser","sqlalchemy","MySQL-python","SOAPpy",'decorator', 'txJSON-RPC'],
         #test_suite="tests",                               #ToDo switch to trial
         description='Non Blocking Interface for sending a bunsh of SMSes, FAXes and Mails.',
         author='Sandro Knauß',