From 79cca65a1a6abf48c40ede942c4c82ef429eaaff Mon Sep 17 00:00:00 2001
From: Alexander Zolotarev <megabogus84@gmail.com>
Date: Tue, 14 Feb 2017 16:44:49 +0300
Subject: [PATCH] modernize fabric3

---
 Dockerfile       |  1 +
 fabfile.py       | 10 +++++-----
 id_rsa           | 27 +++++++++++++++++++++++++++
 requirements.txt |  2 +-
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 id_rsa

diff --git a/Dockerfile b/Dockerfile
index da9908b..577d934 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN chmod 600 -R /root/.ssh
 RUN rm /root/.ssh/id_rsa
 
 ADD . /code
+RUN cp id_rsa /root/.ssh/
 
 run ln -s /code/supervisor-app.conf /etc/supervisor/conf.d/
 RUN pip install -r requirements.txt
diff --git a/fabfile.py b/fabfile.py
index 8878963..8ca1709 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -69,9 +69,9 @@ templates = {
 }
 
 def _print(output):
-    print
-    print output
-    print
+    print ()
+    print ('%s' % output)
+    print ()
 
 def print_command(command):
     _print(blue("$ ", bold=True) +
@@ -173,7 +173,7 @@ def upload_template_and_reload(name):
     owner = template_settings.get("owner")
     mode = template_settings.get("mode")
 
-    print '%s to %s' % (local_path, remote_path)
+    print ('%s to %s' % (local_path, remote_path))
 
     upload_template(local_path, remote_path, env, use_sudo=False, backup=False)
 
@@ -271,7 +271,7 @@ def create():
     """
     Stages the application on the server
     """
-    sudo('rm -r %s -f' % env.project_path)
+    sudo('rm -r -f %s' % env.project_path)
     with cd('/var'):
         run('mkdir -p www')
     with cd('/var/www'):
diff --git a/id_rsa b/id_rsa
new file mode 100644
index 0000000..4709f0e
--- /dev/null
+++ b/id_rsa
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAwCS6IAHQ0u4/3t55bvNxI+kdD1liysdSu1A/7o6oPEZO/bOw
+sFcPf67lZ+fETGOcbZlrPBVoX4Iijs7tVUI5lJoDuU4W4VjWNXisgGFb+O6kElqT
+K/V14Gxy0QvJytnndcnR0ciSiA41bpF5619ziUV1e0yQoeFEy5ptIoU3b3C/DfBl
+YYDcYCZwanH3SJ/6mrweTVVWsba3EtaXTemnCurmEPiLvQTdEbB7/SlNlMvUd6V3
+w0/tcBILb2qs5v/4JGwzKbGrfXt0WzGdVtWcTp/GjoI7APMf2zWVxUyLY7u01pS0
+FXgGlY/jougIn8+v83GYGcxfGBc4Mn6W+BXg4QIDAQABAoIBAEfltkvBwi0bf4Ta
+xJ+yslRYp0oWDXSJTzjOF44hjWw4dthSA7yIZ0FE5YyS2g4ne+I69ThfXlXWsS20
+2nP7uuYTF2+ge8lI36bUh9/mDm9AhN5lTAq356rZicEVYyXnkceuhDe2kLYecvnz
+r6ZWajokZoiDpt8cFw0EtO+k35Bv/tgItobYxL3DRXIny4D528nwc6YhLOUoGZf8
+lGx8HZjp6d33TAHLaA52WCJjlsqXFfA3wWrg24jptHwPS+H28MwPszlv7FC/KeCv
+zfEjU36impVWLdRKcEbppFUfRVHKJOgH7bH/FQ5EFb0dyoxfa72+1et+MXL6ZwjG
+Rs+gcJECgYEA4tFSQBnxdL1ULn1ng0dQIlsejbY0fzYhGxUpxiKOuXAggT2HF9Qw
+QUrKTnfZueuMhDjNL5xRkv23TW3zUm9zg23pfOHSDzNt3Zb79DUNPa3LCSMB/f4c
+248EcGScEXI8ipdJdawFS3cnvf+8h2MboAqTft9aNI1dm6pzyGEa/s0CgYEA2N1Y
+D8Ivpol25ELb2zA4xs6GfPK74liyXIe96YNKCWS4g4oN1PuDJzQ5dz65WD1MCzKU
+/qS4XV8/je+ODHvMm26MUtNELHfdmpwQWC/qH5N1GAhaIjLIBZX3bNtyo/XdrJFx
+CVcD0Gk7v8e7nFs9AIqbL9i5P0W2ktI1l1C4wmUCgYA5hTQCpZGiNVFf6NWTaUZd
+MBZzgb2WdTe4EonhgWoIhPL5U40q8di69iiP9bz1dVLRRUZjyJS3XjhaHoQSZ8k3
+j2wjC3GmATjfdSa4K6wL9EMFMieTLhpLY92QUzNxCTNpQiyS9ujw1mrxuCUrgGrF
+D2mQRzwtD5ypmXR7YITkEQKBgETgsEp5A4diW6eN8KRCQZYrHB3tPm1afHPVDSVw
+dIBdRBlLLK97nqFB/gp4moeDGHbp/taN3JyTVu0uq7AdVdP8HYdk4F87RuAHN027
+EiIrRGJ4rJ/1/v9/LRGe9V9MBLb9jqhHwcdc1QRJXLYBaHOWkkl1DQkijCU/rJO9
+qKDdAoGAcL0feTmrf/31TDdJxtkC5KThDBSvpeoydqc4wJVIKlz+ei7NzT8mWuqg
+sQdYXy0EF3TQdg+BnfhM1bpkwkC9+QZbgu05q8Q+UT9DSsLr09DrQIUeRFQnjg5s
+lQiFk0yUZgL5/EYe5cqw9EEjUf3FQEwxuSR8Tfm5Qu9zYlZs3yI=
+-----END RSA PRIVATE KEY-----
diff --git a/requirements.txt b/requirements.txt
index 3c3841e..758c4f6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -70,4 +70,4 @@ urllib3==1.17
 wcwidth==0.1.7
 widgetsnbextension==1.2.6
 xlwt==1.1.2
-fabric
+fabric3